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 2020/08/03 08:37:18 UTC
[incubator-pinot] branch master updated: Do not apply shade plugin
on parent modules (#5761)
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/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 0e95a67 Do not apply shade plugin on parent modules (#5761)
0e95a67 is described below
commit 0e95a679e3f84831a629b517574f9398b44bbd9b
Author: Yupeng Fu <yu...@users.noreply.github.com>
AuthorDate: Mon Aug 3 01:37:02 2020 -0700
Do not apply shade plugin on parent modules (#5761)
* do not shade parent pom
* remove unused clean plugin
* add config for proto project
---
.../pinot-batch-ingestion-common/pom.xml | 1 +
.../pinot-batch-ingestion-hadoop/pom.xml | 1 +
.../pinot-batch-ingestion-spark/pom.xml | 1 +
.../pinot-batch-ingestion-standalone/pom.xml | 1 +
.../v0_deprecated/pinot-hadoop/pom.xml | 1 +
.../v0_deprecated/pinot-ingestion-common/pom.xml | 1 +
.../v0_deprecated/pinot-spark/pom.xml | 1 +
pinot-plugins/pinot-file-system/pinot-adls/pom.xml | 1 +
pinot-plugins/pinot-file-system/pinot-gcs/pom.xml | 1 +
pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml | 1 +
pinot-plugins/pinot-file-system/pinot-s3/pom.xml | 1 +
.../pinot-input-format/pinot-avro-base/pom.xml | 1 +
pinot-plugins/pinot-input-format/pinot-avro/pom.xml | 1 +
.../pinot-input-format/pinot-confluent-avro/pom.xml | 1 +
pinot-plugins/pinot-input-format/pinot-csv/pom.xml | 1 +
pinot-plugins/pinot-input-format/pinot-json/pom.xml | 1 +
pinot-plugins/pinot-input-format/pinot-orc/pom.xml | 1 +
pinot-plugins/pinot-input-format/pinot-parquet/pom.xml | 1 +
.../pinot-input-format/pinot-protobuf/pom.xml | 1 +
pinot-plugins/pinot-input-format/pinot-thrift/pom.xml | 1 +
.../pinot-stream-ingestion/pinot-kafka-0.9/pom.xml | 1 +
.../pinot-stream-ingestion/pinot-kafka-2.0/pom.xml | 1 +
.../pinot-stream-ingestion/pinot-kafka-base/pom.xml | 1 +
pinot-plugins/pom.xml | 18 ++----------------
24 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/pom.xml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/pom.xml
index 002a766..dbdcbdf 100644
--- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/pom.xml
@@ -35,5 +35,6 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>none</phase.prop>
</properties>
</project>
diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/pom.xml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/pom.xml
index 2307483..e4ea163 100644
--- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/pom.xml
@@ -36,6 +36,7 @@
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
<hadoop.version>2.7.0</hadoop.version>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark/pom.xml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark/pom.xml
index f93f65b..f7f5ca8 100644
--- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark/pom.xml
@@ -35,6 +35,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
diff --git a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/pom.xml b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/pom.xml
index 203400b..7ede22f 100644
--- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/pom.xml
@@ -35,6 +35,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/pom.xml
index 1fd7033..407152e 100644
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-hadoop/pom.xml
@@ -33,6 +33,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<profiles>
<profile>
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/pom.xml
index ab94482..7990373 100644
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-ingestion-common/pom.xml
@@ -35,6 +35,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
diff --git a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml
index e8850b2..4540c9a 100644
--- a/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/v0_deprecated/pinot-spark/pom.xml
@@ -36,6 +36,7 @@
<spark.version>2.2.0</spark.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.11</scala.version>
+ <phase.prop>package</phase.prop>
</properties>
<profiles>
<profile>
diff --git a/pinot-plugins/pinot-file-system/pinot-adls/pom.xml b/pinot-plugins/pinot-file-system/pinot-adls/pom.xml
index 5cad052..6cdebc6 100644
--- a/pinot-plugins/pinot-file-system/pinot-adls/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-adls/pom.xml
@@ -33,6 +33,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml b/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml
index 0e2abaf..f64d5fc 100644
--- a/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-gcs/pom.xml
@@ -35,6 +35,7 @@
<url>https://pinot.apache.org</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml b/pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml
index a8864d2..70d6e07 100644
--- a/pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml
@@ -33,6 +33,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-file-system/pinot-s3/pom.xml b/pinot-plugins/pinot-file-system/pinot-s3/pom.xml
index b8baada..9808672 100644
--- a/pinot-plugins/pinot-file-system/pinot-s3/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-s3/pom.xml
@@ -42,6 +42,7 @@
<reactivestream.version>1.0.3</reactivestream.version>
<s3mock.version>2.1.19</s3mock.version>
<javax.version>3.1.0</javax.version>
+ <phase.prop>package</phase.prop>
</properties>
<dependencyManagement>
diff --git a/pinot-plugins/pinot-input-format/pinot-avro-base/pom.xml b/pinot-plugins/pinot-input-format/pinot-avro-base/pom.xml
index 6efaa4b..296515b 100644
--- a/pinot-plugins/pinot-input-format/pinot-avro-base/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-avro-base/pom.xml
@@ -34,6 +34,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-input-format/pinot-avro/pom.xml b/pinot-plugins/pinot-input-format/pinot-avro/pom.xml
index 31bb566..bc90fe9 100644
--- a/pinot-plugins/pinot-input-format/pinot-avro/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-avro/pom.xml
@@ -34,6 +34,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-input-format/pinot-confluent-avro/pom.xml b/pinot-plugins/pinot-input-format/pinot-confluent-avro/pom.xml
index a649aaf..79d503f 100644
--- a/pinot-plugins/pinot-input-format/pinot-confluent-avro/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-confluent-avro/pom.xml
@@ -36,6 +36,7 @@
<pinot.root>${basedir}/../../..</pinot.root>
<kafka.lib.version>2.0.0</kafka.lib.version>
<confluent.version>5.3.1</confluent.version>
+ <phase.prop>package</phase.prop>
</properties>
<repositories>
<repository>
diff --git a/pinot-plugins/pinot-input-format/pinot-csv/pom.xml b/pinot-plugins/pinot-input-format/pinot-csv/pom.xml
index e206e23..340131e 100644
--- a/pinot-plugins/pinot-input-format/pinot-csv/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-csv/pom.xml
@@ -34,6 +34,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-input-format/pinot-json/pom.xml b/pinot-plugins/pinot-input-format/pinot-json/pom.xml
index 0cd0b98..dec0955 100644
--- a/pinot-plugins/pinot-input-format/pinot-json/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-json/pom.xml
@@ -34,6 +34,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-input-format/pinot-orc/pom.xml b/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
index c3efcfd..93da311 100644
--- a/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
@@ -35,6 +35,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml b/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml
index ea67b95..26c2ad8 100644
--- a/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml
@@ -34,6 +34,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
index d018a89..ea0307a 100644
--- a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
@@ -36,6 +36,7 @@
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
<proto.version>3.11.4</proto.version>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-input-format/pinot-thrift/pom.xml b/pinot-plugins/pinot-input-format/pinot-thrift/pom.xml
index faba9ec..d824a9b 100644
--- a/pinot-plugins/pinot-input-format/pinot-thrift/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-thrift/pom.xml
@@ -34,6 +34,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/pom.xml
index 06a11ad..aea3caa 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/pom.xml
@@ -37,6 +37,7 @@
<pinot.root>${basedir}/../../..</pinot.root>
<kafka.lib.version>0.9.0.1</kafka.lib.version>
<kafka.scala.version>2.10</kafka.scala.version>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml
index 1005b82..e6d47d6 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml
@@ -36,6 +36,7 @@
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
<kafka.lib.version>2.0.0</kafka.lib.version>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/pom.xml
index 5414bde..3de8cdd 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-base/pom.xml
@@ -35,6 +35,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
+ <phase.prop>package</phase.prop>
</properties>
<dependencies>
<dependency>
diff --git a/pinot-plugins/pom.xml b/pinot-plugins/pom.xml
index 535a4ee..99cff23 100644
--- a/pinot-plugins/pom.xml
+++ b/pinot-plugins/pom.xml
@@ -36,6 +36,7 @@
<properties>
<pinot.root>${basedir}/..</pinot.root>
<plugin.type />
+ <phase.prop>none</phase.prop>
</properties>
<modules>
@@ -74,7 +75,7 @@
<version>3.2.1</version>
<executions>
<execution>
- <phase>package</phase>
+ <phase>${phase.prop}</phase>
<goals>
<goal>shade</goal>
</goals>
@@ -108,21 +109,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${pinot.root}/pinot-plugins/target/plugins/</directory>
- <includes>
- <include>**/*.pom</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org