Skip to content

Fix version-specific Spark profiles #25940

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.

Sign up for GitHub

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

Merged
ghelmling merged 1 commit into from
Sep 4, 2025
Merged

Fix version-specific Spark profiles #25940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
111 changes: 84 additions & 27 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@
<dep.guice.version>6.0.0</dep.guice.version>
<dep.arrow.version>17.0.0</dep.arrow.version>
<dep.mariadb.version>3.5.4</dep.mariadb.version>

<dep.pos.classloader.module-name.suffix>2</dep.pos.classloader.module-name.suffix>
<dep.spark.version>2.0.2-6</dep.spark.version>

<!--
America/Bahia_Banderas has:
Expand Down Expand Up @@ -225,7 +224,6 @@
<module>presto-router-example-plugin-scheduler</module>
<module>presto-plan-checker-router-plugin</module>
<module>presto-sql-invoked-functions-plugin</module>
<module>presto-spark-classloader-spark${dep.pos.classloader.module-name.suffix}</module>
</modules>

<dependencyManagement>
Expand Down Expand Up @@ -944,12 +942,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark${dep.pos.classloader.module-name.suffix}</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark</artifactId>
Expand Down Expand Up @@ -987,6 +979,13 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.presto.spark</groupId>
<artifactId>spark-core</artifactId>
<version>${dep.spark.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-base-arrow-flight</artifactId>
Expand Down Expand Up @@ -2538,13 +2537,6 @@
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>com.facebook.presto.spark</groupId>
<artifactId>spark-core</artifactId>
<version>2.0.2-6</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.clearspring.analytics</groupId>
<artifactId>stream</artifactId>
Expand Down Expand Up @@ -3162,6 +3154,78 @@
</plugins>
</build>
</profile>
<profile>
<id>spark2</id>

<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>!spark-version</name>
</property>
</activation>

<properties>
<dep.spark.version>2.0.2-6</dep.spark.version>
</properties>

<modules>
<module>presto-spark-classloader-spark2</module>
</modules>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.6.2</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<!-- TODO: fix this in Airlift resolver -->
<exclude>org.codehaus.plexus:plexus-utils</exclude>
<exclude>com.google.guava:guava</exclude>
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
</configuration>
</plugin>

<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<ignoredClassPatterns combine.children="append">
<ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
<!-- Duplicate class is being brought in by commons-io & log4j-api -->
<ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
<!-- Duplicate class is being brought in by several netty dependencies-->
<ignoredClassPattern>META-INF.versions.11.module-info</ignoredClassPattern>
<!-- Ignore duplicate classes related to lucene-core and ranger-apache -->
<ignoredClassPattern>META-INF.versions.9.org.apache.lucene.*</ignoredClassPattern>
</ignoredClassPatterns>

</configuration>
</plugin>

</plugins>
</pluginManagement>
</build>

</profile>
<profile>
<id>spark3</id>

Expand All @@ -3173,19 +3237,12 @@
</activation>

<properties>
<dep.pos.classloader.module-name.suffix>3</dep.pos.classloader.module-name.suffix>
<dep.spark.version>3.4.1-1</dep.spark.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.facebook.presto.spark</groupId>
<artifactId>spark-core</artifactId>
<version>3.4.1-1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>presto-spark-classloader-spark3</module>
</modules>

<build>
<pluginManagement>
Expand Down
36 changes: 25 additions & 11 deletions presto-spark-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<dep.jetty.version>9.4.55.v20240627</dep.jetty.version>
<dep.okhttp.version>4.12.0</dep.okhttp.version>
<dep.okio-jvm.version>3.9.1</dep.okio-jvm.version>
<dep.pos.classloader.module-name.suffix>2</dep.pos.classloader.module-name.suffix>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -55,12 +54,6 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark${dep.pos.classloader.module-name.suffix}</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-client</artifactId>
Expand Down Expand Up @@ -538,6 +531,25 @@
</plugins>
</build>
</profile>
<profile>
<id>spark2</id>

<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>!spark-version</name>
</property>
</activation>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark2</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>spark3</id>

Expand All @@ -548,11 +560,13 @@
</property>
</activation>

<properties>
<dep.pos.classloader.module-name.suffix>3</dep.pos.classloader.module-name.suffix>
</properties>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark3</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.presto.spark</groupId>
<artifactId>spark-core</artifactId>
Expand Down
45 changes: 24 additions & 21 deletions presto-spark-classloader-interface/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
<air.check.skip-modernizer>true</air.check.skip-modernizer>
<dep.pos.classloader.module-name.suffix>2</dep.pos.classloader.module-name.suffix>
</properties>

<dependencies>
Expand All @@ -23,11 +22,6 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark${dep.pos.classloader.module-name.suffix}</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand All @@ -40,6 +34,25 @@
</dependencies>

<profiles>
<profile>
<id>spark2</id>

<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>!spark-version</name>
</property>
</activation>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark2</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

</profile>
<profile>
<id>spark3</id>

Expand All @@ -50,22 +63,12 @@
</property>
</activation>

<properties>
<dep.pos.classloader.module-name.suffix>3</dep.pos.classloader.module-name.suffix>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.facebook.presto.spark</groupId>
<artifactId>spark-core</artifactId>
<version>3.4.1-1</version>
<scope>compile</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-spark3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
Expand Down
Loading