Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add back shade profile for shade removed in #12712 #12979

Merged
merged 1 commit into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion pinot-clients/pinot-jdbc-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../..</pinot.root>
<shade.phase.prop>package</shade.phase.prop>
</properties>
<build>
<resources>
Expand Down Expand Up @@ -82,4 +81,18 @@
<artifactId>jsr305</artifactId>
</dependency>
</dependencies>
<profiles>
<profile>
<id>build-shaded-jar</id>
<activation>
<property>
<name>skipShade</name>
<value>!true</value>
</property>
</activation>
<properties>
<shade.phase.prop>package</shade.phase.prop>
</properties>
Comment on lines +93 to +95
Copy link
Contributor

@gortiz gortiz Apr 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Isn't that the default phase? IICU we don't need to provide the phase.

</profile>
</profiles>
</project>
11 changes: 10 additions & 1 deletion pinot-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/..</pinot.root>
<shade.phase.prop>package</shade.phase.prop>
</properties>

<build>
Expand Down Expand Up @@ -414,5 +413,15 @@
</plugins>
</build>
</profile>

<profile>
<id>build-shaded-jar</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<shade.phase.prop>package</shade.phase.prop>
</properties>
</profile>
</profiles>
</project>
11 changes: 11 additions & 0 deletions pinot-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,15 @@
</dependency>
<!-- Lucene dependencies end -->
</dependencies>
<profiles>
<profile>
<id>build-shaded-jar</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<shade.phase.prop>package</shade.phase.prop>
</properties>
</profile>
</profiles>
</project>
16 changes: 15 additions & 1 deletion pinot-plugins/pinot-file-system/pinot-s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
<s3mock.version>2.12.2</s3mock.version>
<shade.phase.prop>package</shade.phase.prop>
</properties>

<dependencies>
Expand Down Expand Up @@ -65,4 +64,19 @@
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>build-shaded-jar</id>
<activation>
<property>
<name>skipShade</name>
<value>!true</value>
</property>
</activation>
<properties>
<shade.phase.prop>package</shade.phase.prop>
</properties>
</profile>
</profiles>
</project>
16 changes: 15 additions & 1 deletion pinot-plugins/pinot-stream-ingestion/pinot-kinesis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../../..</pinot.root>
<shade.phase.prop>package</shade.phase.prop>
<reactive.version>1.0.2</reactive.version>
<localstack-utils.version>0.2.23</localstack-utils.version>
</properties>
Expand Down Expand Up @@ -133,4 +132,19 @@
</dependency>

</dependencies>

<profiles>
<profile>
<id>build-shaded-jar</id>
<activation>
<property>
<name>skipShade</name>
<value>!true</value>
</property>
</activation>
<properties>
<shade.phase.prop>package</shade.phase.prop>
</properties>
</profile>
</profiles>
</project>
11 changes: 11 additions & 0 deletions pinot-spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,15 @@
<artifactId>reflections</artifactId>
</dependency>
</dependencies>
<profiles>
<profile>
<id>build-shaded-jar</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<shade.phase.prop>package</shade.phase.prop>
</properties>
</profile>
</profiles>
</project>
Loading