Skip to content

Commit 9c5004f

Browse files
ghelmlingghelmling
committed
Fix up conditional inclusion of Spark2/3 modules
1 parent 92a8ae5 commit 9c5004f

File tree

3 files changed

+133
-59
lines changed

3 files changed

+133
-59
lines changed

‎pom.xml‎

Lines changed: 84 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@
9090
<dep.guice.version>6.0.0</dep.guice.version>
9191
<dep.arrow.version>17.0.0</dep.arrow.version>
9292
<dep.mariadb.version>3.5.4</dep.mariadb.version>
93-
94-
<dep.pos.classloader.module-name.suffix>2</dep.pos.classloader.module-name.suffix>
93+
<dep.spark.version>2.0.2-6</dep.spark.version>
9594

9695
<!--
9796
America/Bahia_Banderas has:
@@ -225,7 +224,6 @@
225224
<module>presto-router-example-plugin-scheduler</module>
226225
<module>presto-plan-checker-router-plugin</module>
227226
<module>presto-sql-invoked-functions-plugin</module>
228-
<module>presto-spark-classloader-spark${dep.pos.classloader.module-name.suffix}</module>
229227
</modules>
230228

231229
<dependencyManagement>
@@ -944,12 +942,6 @@
944942
<version>${project.version}</version>
945943
</dependency>
946944

947-
<dependency>
948-
<groupId>com.facebook.presto</groupId>
949-
<artifactId>presto-spark-classloader-spark${dep.pos.classloader.module-name.suffix}</artifactId>
950-
<version>${project.version}</version>
951-
</dependency>
952-
953945
<dependency>
954946
<groupId>com.facebook.presto</groupId>
955947
<artifactId>presto-spark</artifactId>
@@ -987,6 +979,13 @@
987979
<version>${project.version}</version>
988980
</dependency>
989981

982+
<dependency>
983+
<groupId>com.facebook.presto.spark</groupId>
984+
<artifactId>spark-core</artifactId>
985+
<version>${dep.spark.version}</version>
986+
<scope>provided</scope>
987+
</dependency>
988+
990989
<dependency>
991990
<groupId>com.facebook.presto</groupId>
992991
<artifactId>presto-base-arrow-flight</artifactId>
@@ -2538,13 +2537,6 @@
25382537
<version>2.0.1</version>
25392538
</dependency>
25402539

2541-
<dependency>
2542-
<groupId>com.facebook.presto.spark</groupId>
2543-
<artifactId>spark-core</artifactId>
2544-
<version>2.0.2-6</version>
2545-
<scope>provided</scope>
2546-
</dependency>
2547-
25482540
<dependency>
25492541
<groupId>com.clearspring.analytics</groupId>
25502542
<artifactId>stream</artifactId>
@@ -3162,6 +3154,78 @@
31623154
</plugins>
31633155
</build>
31643156
</profile>
3157+
<profile>
3158+
<id>spark2</id>
3159+
3160+
<activation>
3161+
<activeByDefault>true</activeByDefault>
3162+
<property>
3163+
<name>!spark-version</name>
3164+
</property>
3165+
</activation>
3166+
3167+
<properties>
3168+
<dep.spark.version>2.0.2-6</dep.spark.version>
3169+
</properties>
3170+
3171+
<modules>
3172+
<module>presto-spark-classloader-spark2</module>
3173+
</modules>
3174+
3175+
<build>
3176+
<pluginManagement>
3177+
<plugins>
3178+
<plugin>
3179+
<groupId>org.apache.maven.plugins</groupId>
3180+
<artifactId>maven-enforcer-plugin</artifactId>
3181+
<version>3.3.0</version>
3182+
<dependencies>
3183+
<dependency>
3184+
<groupId>org.codehaus.mojo</groupId>
3185+
<artifactId>extra-enforcer-rules</artifactId>
3186+
<version>1.6.2</version>
3187+
</dependency>
3188+
</dependencies>
3189+
<configuration>
3190+
<skip>true</skip>
3191+
<rules>
3192+
<requireUpperBoundDeps>
3193+
<excludes combine.children="append">
3194+
<!-- TODO: fix this in Airlift resolver -->
3195+
<exclude>org.codehaus.plexus:plexus-utils</exclude>
3196+
<exclude>com.google.guava:guava</exclude>
3197+
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
3198+
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
3199+
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
3200+
</excludes>
3201+
</requireUpperBoundDeps>
3202+
</rules>
3203+
</configuration>
3204+
</plugin>
3205+
3206+
<plugin>
3207+
<groupId>org.basepom.maven</groupId>
3208+
<artifactId>duplicate-finder-maven-plugin</artifactId>
3209+
<configuration>
3210+
<skip>true</skip>
3211+
<ignoredClassPatterns combine.children="append">
3212+
<ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
3213+
<!-- Duplicate class is being brought in by commons-io & log4j-api -->
3214+
<ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
3215+
<!-- Duplicate class is being brought in by several netty dependencies-->
3216+
<ignoredClassPattern>META-INF.versions.11.module-info</ignoredClassPattern>
3217+
<!-- Ignore duplicate classes related to lucene-core and ranger-apache -->
3218+
<ignoredClassPattern>META-INF.versions.9.org.apache.lucene.*</ignoredClassPattern>
3219+
</ignoredClassPatterns>
3220+
3221+
</configuration>
3222+
</plugin>
3223+
3224+
</plugins>
3225+
</pluginManagement>
3226+
</build>
3227+
3228+
</profile>
31653229
<profile>
31663230
<id>spark3</id>
31673231

@@ -3173,19 +3237,12 @@
31733237
</activation>
31743238

31753239
<properties>
3176-
<dep.pos.classloader.module-name.suffix>3</dep.pos.classloader.module-name.suffix>
3240+
<dep.spark.version>3.4.1-1</dep.spark.version>
31773241
</properties>
31783242

3179-
<dependencyManagement>
3180-
<dependencies>
3181-
<dependency>
3182-
<groupId>com.facebook.presto.spark</groupId>
3183-
<artifactId>spark-core</artifactId>
3184-
<version>3.4.1-1</version>
3185-
<scope>provided</scope>
3186-
</dependency>
3187-
</dependencies>
3188-
</dependencyManagement>
3243+
<modules>
3244+
<module>presto-spark-classloader-spark3</module>
3245+
</modules>
31893246

31903247
<build>
31913248
<pluginManagement>

‎presto-spark-base/pom.xml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<dep.jetty.version>9.4.55.v20240627</dep.jetty.version>
1717
<dep.okhttp.version>4.12.0</dep.okhttp.version>
1818
<dep.okio-jvm.version>3.9.1</dep.okio-jvm.version>
19-
<dep.pos.classloader.module-name.suffix>2</dep.pos.classloader.module-name.suffix>
2019
</properties>
2120

2221
<dependencyManagement>
@@ -55,12 +54,6 @@
5554
<scope>provided</scope>
5655
</dependency>
5756

58-
<dependency>
59-
<groupId>com.facebook.presto</groupId>
60-
<artifactId>presto-spark-classloader-spark${dep.pos.classloader.module-name.suffix}</artifactId>
61-
<scope>provided</scope>
62-
</dependency>
63-
6457
<dependency>
6558
<groupId>com.facebook.presto</groupId>
6659
<artifactId>presto-client</artifactId>
@@ -538,6 +531,25 @@
538531
</plugins>
539532
</build>
540533
</profile>
534+
<profile>
535+
<id>spark2</id>
536+
537+
<activation>
538+
<activeByDefault>true</activeByDefault>
539+
<property>
540+
<name>!spark-version</name>
541+
</property>
542+
</activation>
543+
544+
<dependencies>
545+
<dependency>
546+
<groupId>com.facebook.presto</groupId>
547+
<artifactId>presto-spark-classloader-spark2</artifactId>
548+
<version>${project.version}</version>
549+
</dependency>
550+
</dependencies>
551+
</profile>
552+
541553
<profile>
542554
<id>spark3</id>
543555

@@ -548,11 +560,13 @@
548560
</property>
549561
</activation>
550562

551-
<properties>
552-
<dep.pos.classloader.module-name.suffix>3</dep.pos.classloader.module-name.suffix>
553-
</properties>
554-
555563
<dependencies>
564+
<dependency>
565+
<groupId>com.facebook.presto</groupId>
566+
<artifactId>presto-spark-classloader-spark3</artifactId>
567+
<version>${project.version}</version>
568+
</dependency>
569+
556570
<dependency>
557571
<groupId>com.facebook.presto.spark</groupId>
558572
<artifactId>spark-core</artifactId>

‎presto-spark-classloader-interface/pom.xml‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<properties>
1414
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
1515
<air.check.skip-modernizer>true</air.check.skip-modernizer>
16-
<dep.pos.classloader.module-name.suffix>2</dep.pos.classloader.module-name.suffix>
1716
</properties>
1817

1918
<dependencies>
@@ -23,11 +22,6 @@
2322
<scope>provided</scope>
2423
</dependency>
2524

26-
<dependency>
27-
<groupId>com.facebook.presto</groupId>
28-
<artifactId>presto-spark-classloader-spark${dep.pos.classloader.module-name.suffix}</artifactId>
29-
</dependency>
30-
3125
<dependency>
3226
<groupId>com.google.guava</groupId>
3327
<artifactId>guava</artifactId>
@@ -40,6 +34,25 @@
4034
</dependencies>
4135

4236
<profiles>
37+
<profile>
38+
<id>spark2</id>
39+
40+
<activation>
41+
<activeByDefault>true</activeByDefault>
42+
<property>
43+
<name>!spark-version</name>
44+
</property>
45+
</activation>
46+
47+
<dependencies>
48+
<dependency>
49+
<groupId>com.facebook.presto</groupId>
50+
<artifactId>presto-spark-classloader-spark2</artifactId>
51+
<version>${project.version}</version>
52+
</dependency>
53+
</dependencies>
54+
55+
</profile>
4356
<profile>
4457
<id>spark3</id>
4558

@@ -50,22 +63,12 @@
5063
</property>
5164
</activation>
5265

53-
<properties>
54-
<dep.pos.classloader.module-name.suffix>3</dep.pos.classloader.module-name.suffix>
55-
</properties>
56-
57-
<dependencyManagement>
58-
<dependencies>
59-
<dependency>
60-
<groupId>com.facebook.presto.spark</groupId>
61-
<artifactId>spark-core</artifactId>
62-
<version>3.4.1-1</version>
63-
<scope>compile</scope>
64-
</dependency>
65-
</dependencies>
66-
</dependencyManagement>
67-
6866
<dependencies>
67+
<dependency>
68+
<groupId>com.facebook.presto</groupId>
69+
<artifactId>presto-spark-classloader-spark3</artifactId>
70+
<version>${project.version}</version>
71+
</dependency>
6972
<dependency>
7073
<groupId>org.scala-lang</groupId>
7174
<artifactId>scala-library</artifactId>

0 commit comments

Comments
 (0)