From 19dc31fd1d84312592e3fcd96767dfd91b03e9ed Mon Sep 17 00:00:00 2001 From: Saranya Somepalli Date: Thu, 5 Jun 2025 11:49:13 -0700 Subject: [PATCH 1/5] Add IMDS dependency to regions module --- core/regions/pom.xml | 5 ++++ http-clients/url-connection-client/pom.xml | 24 ------------------- test/s3-tests/pom.xml | 18 ++++++++++++++ .../EmptyFileS3IntegrationTest.java | 2 +- .../HeadObjectIntegrationTest.java | 2 +- .../S3WithUrlHttpClientIntegrationTest.java | 3 ++- ...rlHttpConnectionS3IntegrationTestBase.java | 3 ++- 7 files changed, 29 insertions(+), 28 deletions(-) rename {http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http => test/s3-tests/src/it/java/software/amazon/awssdk/services/s3}/urlconnection/EmptyFileS3IntegrationTest.java (97%) rename {http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http => test/s3-tests/src/it/java/software/amazon/awssdk/services/s3}/urlconnection/HeadObjectIntegrationTest.java (97%) rename {http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http => test/s3-tests/src/it/java/software/amazon/awssdk/services/s3}/urlconnection/S3WithUrlHttpClientIntegrationTest.java (98%) rename {http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http => test/s3-tests/src/it/java/software/amazon/awssdk/services/s3}/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java (97%) diff --git a/core/regions/pom.xml b/core/regions/pom.xml index 70c933c6e75f..012f96eb4f5b 100644 --- a/core/regions/pom.xml +++ b/core/regions/pom.xml @@ -33,6 +33,11 @@ annotations ${awsjavasdk.version} + + software.amazon.awssdk + imds + ${awsjavasdk.version} + software.amazon.awssdk utils diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml index 7ff880808f94..8e13fc599d8d 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,18 +71,6 @@ ${awsjavasdk.version} test - - software.amazon.awssdk - regions - ${awsjavasdk.version} - test - - - software.amazon.awssdk - test-utils - ${awsjavasdk.version} - test - org.apache.logging.log4j log4j-api diff --git a/test/s3-tests/pom.xml b/test/s3-tests/pom.xml index 600ece571408..d4b9b628ff16 100644 --- a/test/s3-tests/pom.xml +++ b/test/s3-tests/pom.xml @@ -47,6 +47,24 @@ ${awscrt.version} test + + software.amazon.awssdk + service-test-utils + ${awsjavasdk.version} + test + + + software.amazon.awssdk + url-connection-client + ${awsjavasdk.version} + test + + + software.amazon.awssdk + test-utils + ${awsjavasdk.version} + test + software.amazon.awssdk auth diff --git a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/EmptyFileS3IntegrationTest.java b/test/s3-tests/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 test/s3-tests/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/test/s3-tests/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/test/s3-tests/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 test/s3-tests/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/test/s3-tests/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/test/s3-tests/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 test/s3-tests/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/test/s3-tests/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/test/s3-tests/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 test/s3-tests/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/test/s3-tests/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; From 4def752df5dfa126e26651915927b4018f6e90f5 Mon Sep 17 00:00:00 2001 From: Saranya Somepalli Date: Thu, 5 Jun 2025 12:22:38 -0700 Subject: [PATCH 2/5] Removing unused dependency in regions --- core/regions/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/regions/pom.xml b/core/regions/pom.xml index 012f96eb4f5b..70c933c6e75f 100644 --- a/core/regions/pom.xml +++ b/core/regions/pom.xml @@ -33,11 +33,6 @@ annotations ${awsjavasdk.version} - - software.amazon.awssdk - imds - ${awsjavasdk.version} - software.amazon.awssdk utils From 5e5adcf86b9db0960a53704004b2eb3d3c02bf73 Mon Sep 17 00:00:00 2001 From: Saranya Somepalli Date: Mon, 9 Jun 2025 09:59:14 -0700 Subject: [PATCH 3/5] Moving url-connection integration tests to s3 --- http-clients/url-connection-client/pom.xml | 6 ++++++ services/s3/pom.xml | 6 ++++++ .../EmptyFileS3IntegrationTest.java | 0 .../HeadObjectIntegrationTest.java | 0 .../S3WithUrlHttpClientIntegrationTest.java | 0 ...UrlHttpConnectionS3IntegrationTestBase.java | 0 test/s3-tests/pom.xml | 18 ------------------ 7 files changed, 12 insertions(+), 18 deletions(-) rename {test/s3-tests => services/s3}/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java (100%) rename {test/s3-tests => services/s3}/src/it/java/software/amazon/awssdk/services/s3/urlconnection/HeadObjectIntegrationTest.java (100%) rename {test/s3-tests => services/s3}/src/it/java/software/amazon/awssdk/services/s3/urlconnection/S3WithUrlHttpClientIntegrationTest.java (100%) rename {test/s3-tests => services/s3}/src/it/java/software/amazon/awssdk/services/s3/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java (100%) diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml index 8e13fc599d8d..b414c8e1e30e 100644 --- a/http-clients/url-connection-client/pom.xml +++ b/http-clients/url-connection-client/pom.xml @@ -71,6 +71,12 @@ ${awsjavasdk.version} test + + software.amazon.awssdk + test-utils + ${awsjavasdk.version} + test + org.apache.logging.log4j log4j-api 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/test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java similarity index 100% rename from test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java rename to services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java diff --git a/test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/urlconnection/HeadObjectIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/HeadObjectIntegrationTest.java similarity index 100% rename from test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/urlconnection/HeadObjectIntegrationTest.java rename to services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/HeadObjectIntegrationTest.java diff --git a/test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/urlconnection/S3WithUrlHttpClientIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/S3WithUrlHttpClientIntegrationTest.java similarity index 100% rename from test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/urlconnection/S3WithUrlHttpClientIntegrationTest.java rename to services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/S3WithUrlHttpClientIntegrationTest.java diff --git a/test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java similarity index 100% rename from test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java rename to services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/UrlHttpConnectionS3IntegrationTestBase.java diff --git a/test/s3-tests/pom.xml b/test/s3-tests/pom.xml index d4b9b628ff16..600ece571408 100644 --- a/test/s3-tests/pom.xml +++ b/test/s3-tests/pom.xml @@ -47,24 +47,6 @@ ${awscrt.version} test - - software.amazon.awssdk - service-test-utils - ${awsjavasdk.version} - test - - - software.amazon.awssdk - url-connection-client - ${awsjavasdk.version} - test - - - software.amazon.awssdk - test-utils - ${awsjavasdk.version} - test - software.amazon.awssdk auth From 743ba83a1270d6ff7253a6fc637dabb928932b5c Mon Sep 17 00:00:00 2001 From: Saranya Somepalli Date: Mon, 9 Jun 2025 10:46:31 -0700 Subject: [PATCH 4/5] Adding Changelog --- .changes/next-release/feature-AWSSDKforJavav2-7515446.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changes/next-release/feature-AWSSDKforJavav2-7515446.json diff --git a/.changes/next-release/feature-AWSSDKforJavav2-7515446.json b/.changes/next-release/feature-AWSSDKforJavav2-7515446.json new file mode 100644 index 000000000000..bb036d499cc9 --- /dev/null +++ b/.changes/next-release/feature-AWSSDKforJavav2-7515446.json @@ -0,0 +1,6 @@ +{ + "type": "feature", + "category": "AWS SDK for Java v2", + "contributor": "", + "description": "Removing S3 dependency in URLConnection Client and moving URLConnection integration tests to S3" +} From 1d7234d3f955ceb450924b7a78997bfb41e8fbdf Mon Sep 17 00:00:00 2001 From: Saranya Somepalli Date: Mon, 9 Jun 2025 11:47:21 -0700 Subject: [PATCH 5/5] Removing changelog --- .changes/next-release/feature-AWSSDKforJavav2-7515446.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .changes/next-release/feature-AWSSDKforJavav2-7515446.json diff --git a/.changes/next-release/feature-AWSSDKforJavav2-7515446.json b/.changes/next-release/feature-AWSSDKforJavav2-7515446.json deleted file mode 100644 index bb036d499cc9..000000000000 --- a/.changes/next-release/feature-AWSSDKforJavav2-7515446.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "feature", - "category": "AWS SDK for Java v2", - "contributor": "", - "description": "Removing S3 dependency in URLConnection Client and moving URLConnection integration tests to S3" -}