Skip to content

Commit feeef14

Browse files
wendigowendigo
committed
Ban AWS SDK v1 usage in new code
1 parent 45ce7e4 commit feeef14

File tree

12 files changed

+104
-24
lines changed

12 files changed

+104
-24
lines changed

‎client/trino-jdbc/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,6 @@
235235
<scope>test</scope>
236236
</dependency>
237237

238-
<dependency>
239-
<groupId>io.trino</groupId>
240-
<artifactId>trino-hdfs</artifactId>
241-
<scope>test</scope>
242-
</dependency>
243-
244238
<dependency>
245239
<groupId>io.trino</groupId>
246240
<artifactId>trino-hive</artifactId>

‎lib/trino-hdfs/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,20 @@
292292
</activation>
293293
<build>
294294
<plugins>
295+
<plugin>
296+
<groupId>org.apache.maven.plugins</groupId>
297+
<artifactId>maven-enforcer-plugin</artifactId>
298+
<configuration>
299+
<rules>
300+
<bannedDependencies>
301+
<includes combine.children="append">
302+
<!-- Legacy HDFS file system uses AWS S3 SDK v1 -->
303+
<include>com.amazonaws:*:*</include>
304+
</includes>
305+
</bannedDependencies>
306+
</rules>
307+
</configuration>
308+
</plugin>
295309
<plugin>
296310
<groupId>org.apache.maven.plugins</groupId>
297311
<artifactId>maven-surefire-plugin</artifactId>

‎plugin/trino-delta-lake/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,20 @@
540540
<groupId>org.antlr</groupId>
541541
<artifactId>antlr4-maven-plugin</artifactId>
542542
</plugin>
543+
<plugin>
544+
<groupId>org.apache.maven.plugins</groupId>
545+
<artifactId>maven-enforcer-plugin</artifactId>
546+
<configuration>
547+
<rules>
548+
<bannedDependencies>
549+
<includes combine.children="append">
550+
<!-- Legacy HDFS file system uses AWS S3 SDK v1 -->
551+
<include>com.amazonaws:*:*</include>
552+
</includes>
553+
</bannedDependencies>
554+
</rules>
555+
</configuration>
556+
</plugin>
543557
</plugins>
544558
</build>
545559

‎plugin/trino-geospatial/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,6 @@
127127
<scope>test</scope>
128128
</dependency>
129129

130-
<dependency>
131-
<groupId>io.trino</groupId>
132-
<artifactId>trino-hdfs</artifactId>
133-
<scope>test</scope>
134-
</dependency>
135-
136130
<dependency>
137131
<groupId>io.trino</groupId>
138132
<artifactId>trino-hive</artifactId>

‎plugin/trino-hive/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,20 @@
561561

562562
<build>
563563
<plugins>
564+
<plugin>
565+
<groupId>org.apache.maven.plugins</groupId>
566+
<artifactId>maven-enforcer-plugin</artifactId>
567+
<configuration>
568+
<rules>
569+
<bannedDependencies>
570+
<includes combine.children="append">
571+
<!-- Legacy HDFS file system uses AWS S3 SDK v1 -->
572+
<include>com.amazonaws:*:*</include>
573+
</includes>
574+
</bannedDependencies>
575+
</rules>
576+
</configuration>
577+
</plugin>
564578
<plugin>
565579
<groupId>org.apache.maven.plugins</groupId>
566580
<artifactId>maven-surefire-plugin</artifactId>

‎plugin/trino-hudi/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,20 @@
403403

404404
<build>
405405
<plugins>
406+
<plugin>
407+
<groupId>org.apache.maven.plugins</groupId>
408+
<artifactId>maven-enforcer-plugin</artifactId>
409+
<configuration>
410+
<rules>
411+
<bannedDependencies>
412+
<includes combine.children="append">
413+
<!-- Legacy HDFS file system uses AWS S3 SDK v1 -->
414+
<include>com.amazonaws:*:*</include>
415+
</includes>
416+
</bannedDependencies>
417+
</rules>
418+
</configuration>
419+
</plugin>
406420
<plugin>
407421
<groupId>org.basepom.maven</groupId>
408422
<artifactId>duplicate-finder-maven-plugin</artifactId>

‎plugin/trino-iceberg/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,20 @@
698698
<build>
699699
<pluginManagement>
700700
<plugins>
701+
<plugin>
702+
<groupId>org.apache.maven.plugins</groupId>
703+
<artifactId>maven-enforcer-plugin</artifactId>
704+
<configuration>
705+
<rules>
706+
<bannedDependencies>
707+
<includes combine.children="append">
708+
<!-- Legacy HDFS file system uses AWS S3 SDK v1 -->
709+
<include>com.amazonaws:*:*</include>
710+
</includes>
711+
</bannedDependencies>
712+
</rules>
713+
</configuration>
714+
</plugin>
701715
<plugin>
702716
<groupId>org.apache.maven.plugins</groupId>
703717
<artifactId>maven-dependency-plugin</artifactId>

‎plugin/trino-lakehouse/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,20 @@
260260

261261
<build>
262262
<plugins>
263+
<plugin>
264+
<groupId>org.apache.maven.plugins</groupId>
265+
<artifactId>maven-enforcer-plugin</artifactId>
266+
<configuration>
267+
<rules>
268+
<bannedDependencies>
269+
<includes combine.children="append">
270+
<!-- Legacy HDFS file system uses AWS S3 SDK v1 -->
271+
<include>com.amazonaws:*:*</include>
272+
</includes>
273+
</bannedDependencies>
274+
</rules>
275+
</configuration>
276+
</plugin>
263277
<plugin>
264278
<groupId>org.basepom.maven</groupId>
265279
<artifactId>duplicate-finder-maven-plugin</artifactId>

‎plugin/trino-ranger/pom.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,4 +308,22 @@
308308
<scope>test</scope>
309309
</dependency>
310310
</dependencies>
311+
<build>
312+
<plugins>
313+
<plugin>
314+
<groupId>org.apache.maven.plugins</groupId>
315+
<artifactId>maven-enforcer-plugin</artifactId>
316+
<configuration>
317+
<rules>
318+
<bannedDependencies>
319+
<includes combine.children="append">
320+
<!-- Ranger still relies on the deprecated S3 SDK v1 -->
321+
<include>com.amazonaws:*:*</include>
322+
</includes>
323+
</bannedDependencies>
324+
</rules>
325+
</configuration>
326+
</plugin>
327+
</plugins>
328+
</build>
311329
</project>

‎plugin/trino-session-property-managers/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,6 @@
164164
<scope>test</scope>
165165
</dependency>
166166

167-
<dependency>
168-
<groupId>io.trino</groupId>
169-
<artifactId>trino-hdfs</artifactId>
170-
<scope>test</scope>
171-
</dependency>
172-
173167
<dependency>
174168
<groupId>io.trino</groupId>
175169
<artifactId>trino-hive</artifactId>

0 commit comments

Comments
 (0)