Cleanup unexpected changes from earlier merges and some TODOs

core/auth-crt/pom.xml

@@ -169,6 +169,18 @@
                     </archive>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <!-- This module brings in dependency on http-auth-aws-crt but does not have any code that
+                     explicitly uses it -->
+                    <ignoredUnusedDeclaredDependencies>
+                        <ignoredUnusedDeclaredDependency>software.amazon.awssdk:http-auth-aws-crt</ignoredUnusedDeclaredDependency>
+                    </ignoredUnusedDeclaredDependencies>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

core/http-auth-aws-crt/pom.xml

@@ -60,6 +60,18 @@
                     </archive>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <!-- This module is meant to bring in dependency on aws-crt but does not have any code that
+                     explicitly uses it -->
+                    <ignoredUnusedDeclaredDependencies>
+                        <ignoredUnusedDeclaredDependency>software.amazon.awssdk.crt:aws-crt</ignoredUnusedDeclaredDependency>
+                    </ignoredUnusedDeclaredDependencies>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

core/http-auth-aws-eventstream/pom.xml

@@ -58,6 +58,18 @@
                     </archive>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <!-- This module is meant to bring in dependency on eventstream but does not have any code that
+                     explicitly uses it -->
+                    <ignoredUnusedDeclaredDependencies>
+                        <ignoredUnusedDeclaredDependency>software.amazon.eventstream:eventstream</ignoredUnusedDeclaredDependency>
+                    </ignoredUnusedDeclaredDependencies>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

core/http-auth-aws/pom.xml

@@ -75,6 +75,12 @@
             <version>${awsjavasdk.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk.crt</groupId>
+            <artifactId>aws-crt</artifactId>
+            <version>${awscrt.version}</version>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>http-auth-aws-eventstream</artifactId>
@@ -85,6 +91,7 @@
             <groupId>software.amazon.eventstream</groupId>
             <artifactId>eventstream</artifactId>
             <version>${eventstream.version}</version>
+            <optional>true</optional>
         </dependency>
 
 

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java

@@ -20,7 +20,6 @@
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.SelectedAuthScheme;
-import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
@@ -31,7 +30,6 @@
 import software.amazon.awssdk.core.internal.http.pipeline.RequestToRequestPipeline;
 import software.amazon.awssdk.core.internal.util.MetricUtils;
 import software.amazon.awssdk.core.metrics.CoreMetric;
-import software.amazon.awssdk.core.signer.AsyncRequestBodySigner;
 import software.amazon.awssdk.core.signer.Signer;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpRequest;
@@ -147,18 +145,8 @@ private SdkHttpFullRequest signRequest(SdkHttpFullRequest request, RequestExecut
 
         SdkHttpFullRequest signedRequest = measuredSign.left();
 
-        // TODO: This case does not apply to SigningStage as event stream operations are not supported by SyncClients that
-        //  use this SigningStage. So this is dead code and can be removed.
-        if (signer instanceof AsyncRequestBodySigner) {
-            //Transform request body provider with signing operator
-            AsyncRequestBody transformedRequestProvider =
-                ((AsyncRequestBodySigner) signer)
-                    .signAsyncRequestBody(signedRequest, context.requestProvider(), context.executionAttributes());
-            context.requestProvider(transformedRequestProvider);
-        }
         updateHttpRequestInInterceptorContext(signedRequest, context.executionContext());
         return signedRequest;
-
     }
 
 

pom.xml

@@ -492,6 +492,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <failOnWarning>true</failOnWarning>
                     <ignoreNonCompile>true</ignoreNonCompile>
                     <ignoredUsedUndeclaredDependencies>
                         <!--Ignore used undeclared test dependencies -->
@@ -518,6 +519,9 @@
                         <ignoredUnusedDeclaredDependency>software.amazon.awssdk:aws-sdk-java</ignoredUnusedDeclaredDependency>
                         <!-- Declared by the codegen maven plugins (lite and normal). Not used directly but used to override a transitive dependecy -->
                         <ignoredUnusedDeclaredDependency>org.codehaus.plexus:plexus-utils</ignoredUnusedDeclaredDependency>
+
+                        <!-- TODO(post-sra-identity-auth): Once everything is switched to useSraAuth=true, remove this-->
+                        <ignoredUnusedDeclaredDependency>software.amazon.awssdk:http-auth</ignoredUnusedDeclaredDependency>
                     </ignoredUnusedDeclaredDependencies>
                 </configuration>
             </plugin>
@@ -637,14 +641,9 @@
                             <exclude>*.internal.*</exclude>
                             <exclude>software.amazon.awssdk.thirdparty.*</exclude>
                             <exclude>software.amazon.awssdk.regions.*</exclude>
-                            <exclude>software.amazon.awssdk.utils.async.InputStreamSubscriber</exclude>
-
                             <!-- Moving the interface methods to new SRA super interfaces causes japicmp to complain -->
                             <exclude>software.amazon.awssdk.auth.credentials.AwsCredentials</exclude>
                             <exclude>software.amazon.awssdk.auth.token.credentials.SdkToken</exclude>
-                            <!-- exclude S3CrtAsyncClientBuilder temporarily TODO: re-enable -->
-                            <exclude>software.amazon.awssdk.services.s3.S3CrtAsyncClientBuilder</exclude>
-
                             <!-- exclude ObjectPart size change TODO: re-enable -->
                             <exclude>software.amazon.awssdk.services.s3.model.ObjectPart</exclude>
                         </excludes>

services/datazone/pom.xml

@@ -56,5 +56,10 @@
             <artifactId>aws-json-protocol</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>http-auth-aws</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
     </dependencies>
 </project>

services/mediastoredata/src/it/java/software/amazon/awssdk/services/mediastoredata/TransferEncodingChunkedIntegrationTest.java

@@ -25,21 +25,13 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.reactivestreams.Subscriber;
-import software.amazon.awssdk.core.async.AsyncRequestBody;
-import software.amazon.awssdk.core.interceptor.Context;
-import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
-import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
 import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
 import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
 import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
 import software.amazon.awssdk.identity.spi.IdentityProvider;
-import software.amazon.awssdk.services.mediastore.MediaStoreClient;
 import software.amazon.awssdk.services.mediastore.model.Container;
-import software.amazon.awssdk.services.mediastore.model.ContainerStatus;
-import software.amazon.awssdk.services.mediastore.model.DescribeContainerResponse;
 import software.amazon.awssdk.services.mediastoredata.model.DeleteObjectRequest;
 import software.amazon.awssdk.services.mediastoredata.model.ObjectNotFoundException;
 import software.amazon.awssdk.services.mediastoredata.model.PutObjectRequest;

services/pom.xml

@@ -458,6 +458,11 @@
             <artifactId>endpoints-spi</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>profiles</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <artifactId>apache-client</artifactId>
             <groupId>software.amazon.awssdk</groupId>

services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/MultiRegionAccessPointSigningFunctionalTest.java

@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;

services/transcribestreaming/pom.xml

@@ -43,6 +43,23 @@
                     </archive>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <!-- This module is meant to bring in dependency on http-auth-aws-eventstream but does not have any
+                     code that explicitly uses it -->
+                    <ignoredUnusedDeclaredDependencies>
+                        <ignoredUnusedDeclaredDependency>software.amazon.awssdk:http-auth-aws-eventstream</ignoredUnusedDeclaredDependency>
+
+                        <!-- TODO(post-sra-identity-auth): Once this module is switched to useSraAuth=true, remove this-->
+                        <!-- This ignore is already present in the root pom.xml, but seems like the
+                         ignoredUnusedDeclaredDependencies aren't merged. So repeating it here. -->
+                        <ignoredUnusedDeclaredDependency>software.amazon.awssdk:http-auth</ignoredUnusedDeclaredDependency>
+                    </ignoredUnusedDeclaredDependencies>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/AsyncSignerOverrideTest.java

@@ -60,7 +60,6 @@ public void test_signerOverriddenForStreamingInput_takesPrecedence() {
     }
 
     // TODO(sra-identity-and-auth): Add test for SRA way of overriding signer to assert that overridden signer is used.
-    //  To do this, need ability to inject AuthScheme which uses mock HttpSigner. This is pending https://i.amazon.com/SMITHY-1450
     //  At that point, rename this class to SignerOverrideTest, not specific to AsyncSignerOverride (which was for operation
     //  level codegen changes).
 

test/old-client-version-compatibility-test/pom.xml

@@ -55,33 +55,53 @@
         <!-- Newer core dependencies -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
-            <artifactId>aws-xml-protocol</artifactId>
+            <artifactId>sdk-core</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
-            <artifactId>protocol-core</artifactId>
+            <artifactId>aws-core</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
-            <artifactId>arns</artifactId>
+            <artifactId>auth</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
-            <artifactId>profiles</artifactId>
+            <artifactId>http-auth</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
-            <artifactId>crt-core</artifactId>
+            <artifactId>http-client-spi</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
-            <artifactId>http-auth</artifactId>
+            <artifactId>regions</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+
+        <!-- core dependencies of Old Clients below that are not compile dependencies of this module -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-xml-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>arns</artifactId>
             <version>${awsjavasdk.version}</version>
+            <scope>runtime</scope>
         </dependency>
 
         <!-- Old Clients -->

test/protocol-tests/pom.xml

@@ -133,6 +133,11 @@
             <artifactId>endpoints-spi</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>profiles</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
 
         <!--Test Dependencies-->
         <dependency>