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/09/01 11:19:36 UTC
[pinot] branch adding-tarball-assembly created (now 4639a4047c)
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a change to branch adding-tarball-assembly
in repository https://gitbox.apache.org/repos/asf/pinot.git
at 4639a4047c Separate assembly files to generate different targets
This branch includes the following new commits:
new 4639a4047c Separate assembly files to generate different targets
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[pinot] 01/01: Separate assembly files to generate different targets
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch adding-tarball-assembly
in repository https://gitbox.apache.org/repos/asf/pinot.git
commit 4639a4047c113b88bafea128c7569937c32d2f92
Author: Xiang Fu <xi...@gmail.com>
AuthorDate: Thu Sep 1 04:19:17 2022 -0700
Separate assembly files to generate different targets
---
pinot-distribution/pinot-assembly.xml | 1 -
...not-assembly.xml => pinot-tarball-assembly.xml} | 39 ----------------------
pinot-distribution/pom.xml | 38 +++++----------------
3 files changed, 8 insertions(+), 70 deletions(-)
diff --git a/pinot-distribution/pinot-assembly.xml b/pinot-distribution/pinot-assembly.xml
index ec578aafe1..0cb1082abe 100644
--- a/pinot-distribution/pinot-assembly.xml
+++ b/pinot-distribution/pinot-assembly.xml
@@ -24,7 +24,6 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>bin</id>
<formats>
- <format>tar.gz</format>
<format>dir</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/pinot-distribution/pinot-assembly.xml b/pinot-distribution/pinot-tarball-assembly.xml
similarity index 85%
copy from pinot-distribution/pinot-assembly.xml
copy to pinot-distribution/pinot-tarball-assembly.xml
index ec578aafe1..9d1f314880 100644
--- a/pinot-distribution/pinot-assembly.xml
+++ b/pinot-distribution/pinot-tarball-assembly.xml
@@ -25,7 +25,6 @@
<id>bin</id>
<formats>
<format>tar.gz</format>
- <format>dir</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
@@ -46,14 +45,6 @@
</file>
<!-- Start Include Pinot Plugins-->
<!-- Start Include Pinot Stream Ingestion Plugins-->
- <file>
- <source>
- ${pinot.root}/pinot-plugins/pinot-stream-ingestion/pinot-kafka-0.9/target/pinot-kafka-0.9-${project.version}-shaded.jar
- </source>
- <destName>
- plugins/pinot-stream-ingestion/pinot-kafka-0.9/pinot-kafka-0.9-${project.version}-shaded.jar
- </destName>
- </file>
<file>
<source>
${pinot.root}/pinot-plugins/pinot-stream-ingestion/pinot-kafka-${kafka.version}/target/pinot-kafka-${kafka.version}-${project.version}-shaded.jar
@@ -68,12 +59,6 @@
</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>
@@ -84,30 +69,6 @@
plugins/pinot-batch-ingestion/pinot-batch-ingestion-standalone/pinot-batch-ingestion-standalone-${project.version}-shaded.jar
</destName>
</file>
- <file>
- <source>
- ${pinot.root}/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/target/pinot-batch-ingestion-hadoop-${project.version}-shaded.jar
- </source>
- <destName>
- plugins-external/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/pinot-batch-ingestion-hadoop-${project.version}-shaded.jar
- </destName>
- </file>
- <file>
- <source>
- ${pinot.root}/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/target/pinot-batch-ingestion-spark-2.4-${project.version}-shaded.jar
- </source>
- <destName>
- plugins-external/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pinot-batch-ingestion-spark-2.4-${project.version}-shaded.jar
- </destName>
- </file>
- <file>
- <source>
- ${pinot.root}/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-3.2/target/pinot-batch-ingestion-spark-3.2-${project.version}-shaded.jar
- </source>
- <destName>
- plugins-external/pinot-batch-ingestion/pinot-batch-ingestion-spark-3.2/pinot-batch-ingestion-spark-3.2-${project.version}-shaded.jar
- </destName>
- </file>
<!-- End Include Pinot Batch Ingestion Plugins-->
<!-- Start Include Pinot File System Plugins-->
<file>
diff --git a/pinot-distribution/pom.xml b/pinot-distribution/pom.xml
index 370e573450..969e40d647 100644
--- a/pinot-distribution/pom.xml
+++ b/pinot-distribution/pom.xml
@@ -254,42 +254,20 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- </plugin>
- <!-- Create symlink "build" to the root directory (Unix only) -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.5.0</version>
+ <artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>remove-build-directory</id>
- <phase>clean</phase>
+ <id>bin-tarball-release-assembly-pinot</id>
<goals>
- <goal>exec</goal>
+ <goal>single</goal>
</goals>
- <configuration>
- <executable>rm</executable>
- <arguments>
- <argument>-f</argument>
- <argument>${project.basedir}/../build</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>create-build-directory</id>
<phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
<configuration>
- <executable>ln</executable>
- <arguments>
- <argument>-sfn</argument>
- <argument>${project.basedir}/target/apache-pinot-${project.version}-bin/apache-pinot-${project.version}-bin</argument>
- <argument>${project.basedir}/../build</argument>
- </arguments>
+ <finalName>apache-pinot-${project.version}-bin</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>pinot-tarball-assembly.xml</descriptor>
+ </descriptors>
</configuration>
</execution>
</executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org