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:24:27 UTC
[pinot] branch release-0.11-rc updated (845f4cda80 -> 584a782afb)
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a change to branch release-0.11-rc
in repository https://gitbox.apache.org/repos/asf/pinot.git
discard 845f4cda80 [maven-release-plugin] prepare for next development iteration
omit 6ddcdcbbe2 [maven-release-plugin] prepare release release-0.11.0-rc0
new 584a782afb Separate assembly files to generate different targets
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (845f4cda80)
\
N -- N -- N refs/heads/release-0.11-rc (584a782afb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
contrib/pinot-fmpp-maven-plugin/pom.xml | 6 ++-
pinot-broker/pom.xml | 5 ++-
pinot-clients/pinot-java-client/pom.xml | 5 ++-
pinot-clients/pinot-jdbc-client/pom.xml | 8 ++--
pinot-clients/pom.xml | 6 ++-
pinot-common/pom.xml | 43 +++++++++++----------
pinot-compatibility-verifier/pom.xml | 5 ++-
pinot-connectors/pinot-flink-connector/pom.xml | 8 ++--
pinot-connectors/pinot-spark-connector/pom.xml | 5 ++-
pinot-connectors/pom.xml | 6 ++-
.../pinot-common-jdk8/pom.xml | 7 ++--
.../pinot-core-jdk8/pom.xml | 5 ++-
.../pinot-java-client-jdk8/pom.xml | 5 ++-
.../pinot-segment-local-jdk8/pom.xml | 5 ++-
.../pinot-segment-spi-jdk8/pom.xml | 5 ++-
.../pinot-spi-jdk8/pom.xml | 5 ++-
.../prestodb-pinot-dependencies/pom.xml | 6 ++-
.../presto-pinot-driver/pom.xml | 2 +-
pinot-controller/pom.xml | 5 ++-
pinot-core/pom.xml | 5 ++-
pinot-distribution/pinot-assembly.xml | 1 -
...not-assembly.xml => pinot-tarball-assembly.xml} | 39 -------------------
pinot-distribution/pom.xml | 45 ++++++----------------
pinot-integration-test-base/pom.xml | 5 ++-
pinot-integration-tests/pom.xml | 5 ++-
pinot-minion/pom.xml | 5 ++-
pinot-perf/pom.xml | 5 ++-
.../pinot-batch-ingestion-common/pom.xml | 6 ++-
.../pinot-batch-ingestion-hadoop/pom.xml | 6 ++-
.../pinot-batch-ingestion-spark-2.4/pom.xml | 6 ++-
.../pinot-batch-ingestion-spark-3.2/pom.xml | 6 ++-
.../pinot-batch-ingestion-standalone/pom.xml | 6 ++-
pinot-plugins/pinot-batch-ingestion/pom.xml | 6 ++-
.../v0_deprecated/pinot-hadoop/pom.xml | 7 ++--
.../v0_deprecated/pinot-ingestion-common/pom.xml | 6 ++-
.../v0_deprecated/pinot-spark/pom.xml | 7 ++--
.../pinot-batch-ingestion/v0_deprecated/pom.xml | 6 ++-
.../pinot-environment/pinot-azure/pom.xml | 6 ++-
pinot-plugins/pinot-environment/pom.xml | 6 ++-
pinot-plugins/pinot-file-system/pinot-adls/pom.xml | 5 ++-
pinot-plugins/pinot-file-system/pinot-gcs/pom.xml | 6 ++-
pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml | 5 ++-
pinot-plugins/pinot-file-system/pinot-s3/pom.xml | 9 +++--
pinot-plugins/pinot-file-system/pom.xml | 6 ++-
.../pinot-input-format/pinot-avro-base/pom.xml | 5 ++-
.../pinot-input-format/pinot-avro/pom.xml | 5 ++-
.../pinot-confluent-avro/pom.xml | 5 ++-
pinot-plugins/pinot-input-format/pinot-csv/pom.xml | 5 ++-
.../pinot-input-format/pinot-json/pom.xml | 5 ++-
pinot-plugins/pinot-input-format/pinot-orc/pom.xml | 6 ++-
.../pinot-input-format/pinot-parquet/pom.xml | 5 ++-
.../pinot-input-format/pinot-protobuf/pom.xml | 5 ++-
.../pinot-input-format/pinot-thrift/pom.xml | 5 ++-
pinot-plugins/pinot-input-format/pom.xml | 6 ++-
.../pinot-metrics/pinot-dropwizard/pom.xml | 5 ++-
pinot-plugins/pinot-metrics/pinot-yammer/pom.xml | 5 ++-
pinot-plugins/pinot-metrics/pom.xml | 6 ++-
.../pinot-minion-builtin-tasks/pom.xml | 5 ++-
pinot-plugins/pinot-minion-tasks/pom.xml | 6 ++-
.../pinot-segment-uploader-default/pom.xml | 6 ++-
pinot-plugins/pinot-segment-uploader/pom.xml | 6 ++-
.../pinot-segment-writer-file-based/pom.xml | 6 ++-
pinot-plugins/pinot-segment-writer/pom.xml | 6 ++-
.../pinot-stream-ingestion/pinot-kafka-0.9/pom.xml | 9 +++--
.../pinot-stream-ingestion/pinot-kafka-2.0/pom.xml | 6 ++-
.../pinot-kafka-base/pom.xml | 6 ++-
.../pinot-stream-ingestion/pinot-kinesis/pom.xml | 12 ++++--
.../pinot-stream-ingestion/pinot-pulsar/pom.xml | 6 ++-
pinot-plugins/pinot-stream-ingestion/pom.xml | 6 ++-
pinot-plugins/pom.xml | 11 ++++--
pinot-query-planner/pom.xml | 5 ++-
pinot-query-runtime/pom.xml | 5 ++-
pinot-segment-local/pom.xml | 5 ++-
pinot-segment-spi/pom.xml | 5 ++-
pinot-server/pom.xml | 5 ++-
pinot-spi/pom.xml | 5 ++-
pinot-tools/pom.xml | 5 ++-
pom.xml | 11 +++---
78 files changed, 307 insertions(+), 255 deletions(-)
copy pinot-distribution/{pinot-assembly.xml => pinot-tarball-assembly.xml} (85%)
---------------------------------------------------------------------
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 release-0.11-rc
in repository https://gitbox.apache.org/repos/asf/pinot.git
commit 584a782afbfc03a7dc45b6c04d53dc88133b7756
Author: Xiang Fu <xi...@gmail.com>
AuthorDate: Thu Sep 1 04:22:31 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 e1be9af223..e339df3243 100644
--- a/pinot-distribution/pom.xml
+++ b/pinot-distribution/pom.xml
@@ -255,42 +255,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