This is an automated email from the ASF dual-hosted git repository.
gortiz 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 0eea5c5150 Move plugin assembly into a separate profile to fix apache
release (#14379)
0eea5c5150 is described below
commit 0eea5c51507b2315a4c508e22d3e5df246f7484e
Author: Xiaotian (Jackie) Jiang <17555551+jackie-ji...@users.noreply.github.com>
AuthorDate: Thu Nov 7 02:55:59 2024 -0800
Move plugin assembly into a separate profile to fix apache release (#14379)
---
.../pinot-metrics/pinot-dropwizard/pom.xml | 9 ---
pinot-plugins/pom.xml | 82 ++++++++++++----------
2 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/pinot-plugins/pinot-metrics/pinot-dropwizard/pom.xml
b/pinot-plugins/pinot-metrics/pinot-dropwizard/pom.xml
index d865e13979..81ed2b065b 100644
--- a/pinot-plugins/pinot-metrics/pinot-dropwizard/pom.xml
+++ b/pinot-plugins/pinot-metrics/pinot-dropwizard/pom.xml
@@ -35,15 +35,6 @@
<shade.phase.prop>package</shade.phase.prop>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
diff --git a/pinot-plugins/pom.xml b/pinot-plugins/pom.xml
index d26a36a997..d3733c5e02 100644
--- a/pinot-plugins/pom.xml
+++ b/pinot-plugins/pom.xml
@@ -19,7 +19,8 @@
under the License.
-->
-<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";>
+<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</artifactId>
@@ -32,7 +33,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/..</pinot.root>
- <plugin.type />
+ <plugin.type/>
<hadoop.dependencies.scope>compile</hadoop.dependencies.scope>
</properties>
@@ -50,42 +51,6 @@
<module>pinot-timeseries-lang</module>
</modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.pinot</groupId>
- <artifactId>assembly-descriptor</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>pinot-plugin</descriptorRef>
- </descriptorRefs>
- <archiverConfig>
- <compress>${archiver.compress}</compress>
- </archiverConfig>
-
<recompressZippedFiles>${archiver.recompressZippedFiles}</recompressZippedFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.pinot</groupId>
@@ -105,6 +70,47 @@
</dependency>
</dependencies>
<profiles>
+ <profile>
+ <id>plugin-assembly</id>
+ <activation>
+ <file>
+ <exists>src/main/resources/pinot-plugin.properties</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>assembly-descriptor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>pinot-plugin</descriptorRef>
+ </descriptorRefs>
+ <archiverConfig>
+ <compress>${archiver.compress}</compress>
+ </archiverConfig>
+
<recompressZippedFiles>${archiver.recompressZippedFiles}</recompressZippedFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>use-provided-hadoop</id>
<activation>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
