Skip to content

fix: Enable maven-enforcer-plugin for both spark2 and spark3 profiles #26559

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+395 −4
Open

fix: Enable maven-enforcer-plugin for both spark2 and spark3 profiles #26559

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
34 changes: 30 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2837,6 +2837,8 @@
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
<exclude>com.google.errorprone:error_prone_annotations</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
Expand Down Expand Up @@ -3240,7 +3242,6 @@
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
Expand All @@ -3260,7 +3261,6 @@
<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 -->
Expand Down Expand Up @@ -3298,6 +3298,34 @@
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>20</maxJdkVersion>
<excludes combine.children="append">
<exclude>com.facebook.presto.spark:spark-core:jar</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
</plugin>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredDependencies>
<dependency>
<groupId>com.facebook.presto.spark</groupId>
<artifactId>spark-core</artifactId>
</dependency>
</ignoredDependencies>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
Expand All @@ -3312,7 +3340,6 @@
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
Expand All @@ -3332,7 +3359,6 @@
<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 -->
Expand Down
22 changes: 22 additions & 0 deletions presto-bigquery/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,12 +398,34 @@
<exclude>com.google.api.grpc:proto-google-common-protos</exclude>
<!-- Exclude protobuf-java so enforcer doesn’t force upgrade to 4.x -->
<exclude>com.google.protobuf:protobuf-java</exclude>
<exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</exclude>
<exclude>org.checkerframework:checker-qual</exclude>
<exclude>io.opentelemetry:opentelemetry-api</exclude>
<exclude>io.grpc:grpc-util</exclude>
<exclude>commons-codec:commons-codec</exclude>
<exclude>com.google.errorprone:error_prone_annotations</exclude>
<exclude>io.opentelemetry:opentelemetry-context</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
</configuration>
</plugin>

<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredClassPatterns combine.children="append">
<!-- Ignore duplicate classes in com.google.re2j:re2j and com.teradata:re2j-td -->
<ignoredClassPattern>com.google.re2j.*</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredResourcePatterns>
<!-- Ignore duplicate resources in org.apache.arrow -->
<ignoredResourcePattern>arrow-git.properties</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
28 changes: 28 additions & 0 deletions presto-db-session-property-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,32 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<exclude>com.google.errorprone:error_prone_annotations</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
</excludes>
</requireUpperBoundDeps>
<enforceBytecodeVersion>
<maxJdkVersion>20</maxJdkVersion>
<excludes combine.children="append">
<exclude>io.leangen.geantyref:geantyref:jar</exclude>
<exclude>org.jdbi:jdbi3-sqlobject:jar</exclude>
<exclude>org.jdbi:jdbi3-core:jar</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
27 changes: 27 additions & 0 deletions presto-file-session-property-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,31 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<exclude>com.google.errorprone:error_prone_annotations</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
</excludes>
</requireUpperBoundDeps>
<enforceBytecodeVersion>
<maxJdkVersion>20</maxJdkVersion>
<excludes combine.children="append">
<exclude>io.leangen.geantyref:geantyref:jar</exclude>
<exclude>org.jdbi:jdbi3-core:jar</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
24 changes: 24 additions & 0 deletions presto-google-sheets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,28 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<exclude>com.google.errorprone:error_prone_annotations</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>com.google.http-client:google-http-client-gson</exclude>
<exclude>com.google.auth:google-auth-library-credentials</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
21 changes: 21 additions & 0 deletions presto-hana/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,27 @@
</dependency>
</dependencies>


<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredClassPatterns combine.children="append">
<!-- Ignore duplicate classes in org.bouncycastle -->
<ignoredClassPattern>org.bouncycastle.*</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredResourcePatterns>
<ignoredResourcePattern>org/bouncycastle/x509/CertPathReviewerMessages.*.properties</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
<profile>
<id>ci</id>
Expand Down
4 changes: 4 additions & 0 deletions presto-hive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,11 +519,15 @@
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
<ignoredResourcePattern>META-INF.versions.9.module-info</ignoredResourcePattern>
<!-- Ignore duplicate resources in com.starburstdata and org.bouncycastle -->
<ignoredResourcePattern>org/bouncycastle/x509/CertPathReviewerMessages.*.properties</ignoredResourcePattern>
</ignoredResourcePatterns>
<ignoredClassPatterns>
<ignoredClassPattern>shaded.parquet.it.unimi.dsi.fastutil.*</ignoredClassPattern>
<ignoredClassPattern>module-info</ignoredClassPattern>
<ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
<!-- Ignore duplicate classes in org.bouncycastle -->
<ignoredClassPattern>org.bouncycastle.*</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredDependencies>
<dependency>
Expand Down
9 changes: 9 additions & 0 deletions presto-hudi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,16 @@
<ignoredClassPatterns>
<ignoredClassPattern>module-info</ignoredClassPattern>
<ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
<!-- Ignore duplicate classes in io.airlift:aircompressor and org.apache.hudi:hudi-presto-bundle -->
<ignoredClassPattern>io.airlift.compress.*</ignoredClassPattern>
<!-- Ignore duplicate classes in com.facebook.presto.hive:hive-apache and org.apache.hive:hive-storage-api -->
<ignoredClassPattern>org.apache.hadoop.hive.*</ignoredClassPattern>
<ignoredClassPattern>org.apache.hive.common.util.*</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredResourcePatterns>
<!-- Ignore duplicate resources in com.facebook.presto.hive:hive-apache and org.apache.hudi:hudi-presto-bundle -->
<ignoredResourcePattern>logicalType.avsc</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 2 additions & 0 deletions presto-iceberg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,13 +777,15 @@
<ignoredResourcePattern>org.apache.avro.data/Json.avsc</ignoredResourcePattern>
<ignoredResourcePattern>iceberg-build.properties</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
<ignoredResourcePattern>org/bouncycastle/x509/CertPathReviewerMessages.*.properties</ignoredResourcePattern>
</ignoredResourcePatterns>
<ignoredClassPatterns>
<ignoredClassPattern>shaded.parquet.it.unimi.dsi.fastutil.*</ignoredClassPattern>
<ignoredClassPattern>module-info</ignoredClassPattern>
<ignoredClassPattern>org.apache.avro.*</ignoredClassPattern>
<ignoredClassPattern>org.apache.parquet.*</ignoredClassPattern>
<ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
<ignoredClassPattern>org.bouncycastle.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</plugin>
Expand Down
14 changes: 14 additions & 0 deletions presto-kudu/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,20 @@
</additionalDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>20</maxJdkVersion>
<excludes combine.children="append">
<exclude>org.apache.yetus:audience-annotations:jar</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
</plugin>
</plugins>
</pluginManagement>

Expand Down
20 changes: 20 additions & 0 deletions presto-main-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,26 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<exclude>com.google.errorprone:error_prone_annotations</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
</excludes>
</requireUpperBoundDeps>
<enforceBytecodeVersion>
<maxJdkVersion>20</maxJdkVersion>
<excludes combine.children="append">
<exclude>org.jgrapht:jgrapht-core</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
3 changes: 3 additions & 0 deletions presto-pinot-toolkit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,9 @@
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>org.apache.helix.*</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredDependencies>
<dependency>
<groupId>org.apache.helix</groupId>
Expand Down
16 changes: 16 additions & 0 deletions presto-pinot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,26 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<exclude>it.unimi.dsi:fastutil</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
</configuration>
</plugin>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>org.apache.helix.*</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredDependencies>
<dependency>
<groupId>io.netty</groupId>
Expand Down
Loading
Loading