diff --git a/core/auth-crt/pom.xml b/core/auth-crt/pom.xml
index a4cd6d9f21b8..4114f67a0947 100644
--- a/core/auth-crt/pom.xml
+++ b/core/auth-crt/pom.xml
@@ -169,6 +169,18 @@
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+
+ software.amazon.awssdk:http-auth-aws-crt
+
+
+
diff --git a/core/http-auth-aws-crt/pom.xml b/core/http-auth-aws-crt/pom.xml
index 132bd0c0d354..1beeb27f3d63 100644
--- a/core/http-auth-aws-crt/pom.xml
+++ b/core/http-auth-aws-crt/pom.xml
@@ -60,6 +60,18 @@
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+
+ software.amazon.awssdk.crt:aws-crt
+
+
+
diff --git a/core/http-auth-aws-eventstream/pom.xml b/core/http-auth-aws-eventstream/pom.xml
index 04f31196ec72..2b800c14b58c 100644
--- a/core/http-auth-aws-eventstream/pom.xml
+++ b/core/http-auth-aws-eventstream/pom.xml
@@ -58,6 +58,18 @@
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+
+ software.amazon.eventstream:eventstream
+
+
+
diff --git a/core/http-auth-aws/pom.xml b/core/http-auth-aws/pom.xml
index ef807cf61deb..fc691a545f1d 100644
--- a/core/http-auth-aws/pom.xml
+++ b/core/http-auth-aws/pom.xml
@@ -75,6 +75,12 @@
${awsjavasdk.version}
true
+
+ software.amazon.awssdk.crt
+ aws-crt
+ ${awscrt.version}
+ true
+
software.amazon.awssdk
http-auth-aws-eventstream
@@ -85,6 +91,7 @@
software.amazon.eventstream
eventstream
${eventstream.version}
+ true
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
index 9a99af93e7da..2399c39cab58 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
+++ b/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;
-
}
diff --git a/pom.xml b/pom.xml
index db82c65c1c0d..7f49ec35b786 100644
--- a/pom.xml
+++ b/pom.xml
@@ -492,6 +492,7 @@
+ true
true
@@ -518,6 +519,9 @@
software.amazon.awssdk:aws-sdk-java
org.codehaus.plexus:plexus-utils
+
+
+ software.amazon.awssdk:http-auth
@@ -637,14 +641,9 @@
*.internal.*
software.amazon.awssdk.thirdparty.*
software.amazon.awssdk.regions.*
- software.amazon.awssdk.utils.async.InputStreamSubscriber
-
software.amazon.awssdk.auth.credentials.AwsCredentials
software.amazon.awssdk.auth.token.credentials.SdkToken
-
- software.amazon.awssdk.services.s3.S3CrtAsyncClientBuilder
-
software.amazon.awssdk.services.s3.model.ObjectPart
diff --git a/services/datazone/pom.xml b/services/datazone/pom.xml
index b410c684b16d..9363f946672a 100644
--- a/services/datazone/pom.xml
+++ b/services/datazone/pom.xml
@@ -56,5 +56,10 @@
aws-json-protocol
${awsjavasdk.version}
+
+ software.amazon.awssdk
+ http-auth-aws
+ ${awsjavasdk.version}
+
diff --git a/services/mediastoredata/src/it/java/software/amazon/awssdk/services/mediastoredata/TransferEncodingChunkedIntegrationTest.java b/services/mediastoredata/src/it/java/software/amazon/awssdk/services/mediastoredata/TransferEncodingChunkedIntegrationTest.java
index 079e7161da4a..8ad6ca31e7e8 100644
--- a/services/mediastoredata/src/it/java/software/amazon/awssdk/services/mediastoredata/TransferEncodingChunkedIntegrationTest.java
+++ b/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;
diff --git a/services/pom.xml b/services/pom.xml
index 2dd5ea565ff3..2208441d8189 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -458,6 +458,11 @@
endpoints-spi
${awsjavasdk.version}
+
+ software.amazon.awssdk
+ profiles
+ ${awsjavasdk.version}
+
apache-client
software.amazon.awssdk
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/MultiRegionAccessPointSigningFunctionalTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/MultiRegionAccessPointSigningFunctionalTest.java
index 058c2b71d00b..08e5be5e094d 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/MultiRegionAccessPointSigningFunctionalTest.java
+++ b/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;
diff --git a/services/transcribestreaming/pom.xml b/services/transcribestreaming/pom.xml
index d4df9fc516f7..128ad1a5d345 100644
--- a/services/transcribestreaming/pom.xml
+++ b/services/transcribestreaming/pom.xml
@@ -43,6 +43,23 @@
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+
+ software.amazon.awssdk:http-auth-aws-eventstream
+
+
+
+ software.amazon.awssdk:http-auth
+
+
+
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/AsyncSignerOverrideTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/AsyncSignerOverrideTest.java
index 11c56ef6c7fc..f1d6b9257d02 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/AsyncSignerOverrideTest.java
+++ b/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).
diff --git a/test/old-client-version-compatibility-test/pom.xml b/test/old-client-version-compatibility-test/pom.xml
index 6dce1435b35a..bf92cd8a902e 100644
--- a/test/old-client-version-compatibility-test/pom.xml
+++ b/test/old-client-version-compatibility-test/pom.xml
@@ -55,33 +55,53 @@
software.amazon.awssdk
- aws-xml-protocol
+ sdk-core
${awsjavasdk.version}
software.amazon.awssdk
- protocol-core
+ aws-core
${awsjavasdk.version}
software.amazon.awssdk
- arns
+ auth
${awsjavasdk.version}
software.amazon.awssdk
- profiles
+ http-auth
${awsjavasdk.version}
software.amazon.awssdk
- crt-core
+ http-client-spi
${awsjavasdk.version}
software.amazon.awssdk
- http-auth
+ regions
+ ${awsjavasdk.version}
+
+
+
+
+ software.amazon.awssdk
+ aws-xml-protocol
+ ${awsjavasdk.version}
+ runtime
+
+
+ software.amazon.awssdk
+ protocol-core
+ ${awsjavasdk.version}
+ runtime
+
+
+ software.amazon.awssdk
+ arns
${awsjavasdk.version}
+ runtime
diff --git a/test/protocol-tests/pom.xml b/test/protocol-tests/pom.xml
index 1f70301d43a3..f0fb7675b97d 100644
--- a/test/protocol-tests/pom.xml
+++ b/test/protocol-tests/pom.xml
@@ -133,6 +133,11 @@
endpoints-spi
${awsjavasdk.version}
+
+ software.amazon.awssdk
+ profiles
+ ${awsjavasdk.version}
+