Fix plugin packaging

Author: pdabre12

presto-product-tests/conf/docker/common/compose-commons.sh

@@ -39,16 +39,6 @@ if [[ -z "${PRESTO_SERVER_DIR:-}" ]]; then
     source "${PRODUCT_TESTS_ROOT}/target/classes/presto.env"
     PRESTO_SERVER_DIR="${PROJECT_ROOT}/presto-server/target/presto-server-${PRESTO_VERSION}/"
 fi
-
-# The following plugin results in a function signature conflict when loaded in Java/ sidecar disabled native clusters.
-# This plugin is only meant for sidecar enabled native clusters, hence exclude it.
-PLUGIN_TO_EXCLUDE="native-sql-invoked-functions-plugin"
-
-if [[ -d "${PRESTO_SERVER_DIR}/plugin/${PLUGIN_TO_EXCLUDE}" ]]; then
-    echo "Excluding plugin: $PLUGIN_TO_EXCLUDE"
-    rm -rf "${PRESTO_SERVER_DIR}/plugin/${PLUGIN_TO_EXCLUDE}"
-fi
-
 export_canonical_path PRESTO_SERVER_DIR
 
 if [[ -z "${PRESTO_CLI_JAR:-}" ]]; then

presto-server/pom.xml

@@ -34,6 +34,26 @@
                 <groupId>ca.vanzyl.provisio.maven.plugins</groupId>
                 <artifactId>provisio-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>prune-plugins</id>
+                        <phase>package</phase>
+                        <goals><goal>run</goal></goals>
+                        <configuration>
+                            <target>
+                                <!-- delete based on profile property -->
+                                <delete includeemptydirs="true" quiet="true">
+                                    <fileset dir="${project.build.directory}/presto-server-${project.version}/plugin" includes="${plugin.excludes}"/>
+                                </delete>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -59,7 +79,29 @@
                      uses the nexus-staging-maven-plugin for deployment -->
                 <skipTakariLifecyclePlugin>true</skipTakariLifecyclePlugin>
                 <air.check.skip-modernizer>true</air.check.skip-modernizer>
-    </properties>
+            </properties>
         </profile>
+
+        <!-- Java cluster -->
+            <profile>
+                <id>java</id>
+                <activation><activeByDefault>true</activeByDefault></activation>
+                <properties>
+                    <!-- remove native sidecar plugins -->
+                    <plugin.excludes>
+                        native-sidecar-plugin/**,
+                        native-sql-invoked-functions-plugin/**
+                    </plugin.excludes>
+                </properties>
+            </profile>
+
+            <!-- Native cluster -->
+            <profile>
+                <id>native</id>
+                <properties>
+                    <!-- remove SQL functions plugin -->
+                    <plugin.excludes>sql-invoked-functions-plugin/**</plugin.excludes>
+                </properties>
+            </profile>
     </profiles>
 </project>