diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml index 7ff880808f94..b414c8e1e30e 100644 --- a/http-clients/url-connection-client/pom.xml +++ b/http-clients/url-connection-client/pom.xml @@ -60,18 +60,6 @@ junit-vintage-engine test - - software.amazon.awssdk - s3 - ${awsjavasdk.version} - test - - - service-test-utils - software.amazon.awssdk - ${awsjavasdk.version} - test - org.assertj assertj-core @@ -83,12 +71,6 @@ ${awsjavasdk.version} test - - software.amazon.awssdk - regions - ${awsjavasdk.version} - test - software.amazon.awssdk test-utils diff --git a/services/s3/pom.xml b/services/s3/pom.xml index 9bab5eb2bed3..dc0f5a497f5d 100644 --- a/services/s3/pom.xml +++ b/services/s3/pom.xml @@ -110,6 +110,12 @@ checksums-spi ${awsjavasdk.version} + + software.amazon.awssdk + url-connection-client + ${awsjavasdk.version} + test + software.amazon.awssdk.crt aws-crt diff --git a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/EmptyFileS3IntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java similarity index 97% rename from http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/EmptyFileS3IntegrationTest.java rename to services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java index 4a33f114aca0..7de782e87bf6 100644 --- a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/EmptyFileS3IntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package software.amazon.awssdk.http.urlconnection; +package software.amazon.awssdk.services.s3.urlconnection; import static org.assertj.core.api.Assertions.assertThat; import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName; diff --git a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/HeadObjectIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/HeadObjectIntegrationTest.java similarity index 97% rename from http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/HeadObjectIntegrationTest.java rename to services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/HeadObjectIntegrationTest.java index 678231eb05bf..fa1720860525 100644 --- a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/HeadObjectIntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/HeadObjectIntegrationTest.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package software.amazon.awssdk.http.urlconnection; +package software.amazon.awssdk.services.s3.urlconnection; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/S3WithUrlHttpClientIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/S3WithUrlHttpClientIntegrationTest.java similarity index 98% rename from http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/S3WithUrlHttpClientIntegrationTest.java rename to services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/S3WithUrlHttpClientIntegrationTest.java index c0ed9d162971..41e73f72edb7 100644 --- a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/S3WithUrlHttpClientIntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/S3WithUrlHttpClientIntegrationTest.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package software.amazon.awssdk.http.urlconnection; +package software.amazon.awssdk.services.s3.urlconnection; import static org.assertj.core.api.Assertions.assertThat; import static software.amazon.awssdk.testutils.service.AwsTestBase.CREDENTIALS_PROVIDER_CHAIN; @@ -34,6 +34,7 @@ import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.http.SdkHttpHeaders; import software.amazon.awssdk.http.SdkHttpRequest; +import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.S3ClientBuilder; diff --git a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java similarity index 97% rename from http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java rename to services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java index d184e8b5da4e..497277075ad5 100644 --- a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java @@ -13,11 +13,12 @@ * permissions and limitations under the License. */ -package software.amazon.awssdk.http.urlconnection; +package software.amazon.awssdk.services.s3.urlconnection; import java.util.Iterator; import java.util.List; import org.junit.jupiter.api.BeforeAll; +import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.S3ClientBuilder;