Dependency fixes after rebase

trinodb · Jul 4, 2023 · 4343d86 · 4343d86
1 parent 00b1c63
commit 4343d86
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/plugin/trino-delta-lake/pom.xml b/plugin/trino-delta-lake/pom.xml
@@ -189,6 +189,16 @@
             <artifactId>glue</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>metrics-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sdk-core</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>utils</artifactId>
@@ -452,8 +462,10 @@
                              we only explicitly use a class from aws-java-sdk-glue, which in turn extends from a class from
                              aws-java-sdk-core -->
                         <ignoredDependency>com.amazonaws:aws-java-sdk-core</ignoredDependency>
-                        <ignoredDependency>software.amazon.awssdk:auth</ignoredDependency>
                         <ignoredDependency>org.apache.iceberg:iceberg-api</ignoredDependency>
+                        <ignoredDependency>software.amazon.awssdk:auth</ignoredDependency>
+                        <ignoredDependency>software.amazon.awssdk:metrics-spi</ignoredDependency>
+                        <ignoredDependency>software.amazon.awssdk:sdk-core</ignoredDependency>
                     </ignoredNonTestScopedDependencies>
                     <ignoredUnusedDeclaredDependencies>
                         <!-- dependency plugin fails to recognize software.amazon.awssdk:utils as a compile-time dependency,

diff --git a/plugin/trino-iceberg/pom.xml b/plugin/trino-iceberg/pom.xml
@@ -266,6 +266,11 @@
             <artifactId>glue</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>metrics-spi</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>sdk-core</artifactId>
@@ -571,6 +576,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <configuration>
+                    <ignoredNonTestScopedDependencies>
+                        <ignoredDependency>software.amazon.awssdk:metrics-spi</ignoredDependency>
+                    </ignoredNonTestScopedDependencies>
                     <ignoredUnusedDeclaredDependencies>
                         <!-- dependency plugin fails to recognize software.amazon.awssdk:utils as a compile-time dependency,
                              as it is not directly used, however most of the other dependencies from software.amazon.awssdk

diff --git a/testing/trino-product-tests/pom.xml b/testing/trino-product-tests/pom.xml
@@ -229,6 +229,11 @@
             <artifactId>glue</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sdk-core</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>utils</artifactId>