From da1790ddecfc922029538e3e8d1005124887b72e Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 15 May 2026 10:26:42 -0700 Subject: [PATCH 1/7] pick up s3 changes --- crt/aws-c-s3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index a31a65784..f1a52b5e9 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit a31a657840daffbfa7749b63cd0e2a178a6a5d9e +Subproject commit f1a52b5e960c06bd9392cb5e982c6fe04f1ce253 From 8b512a8e3343a523cb28e9835793f62377d10732 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 15 May 2026 10:39:44 -0700 Subject: [PATCH 2/7] common as well --- crt/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index 95515a8b1..7f18168e8 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 95515a8b1ff40d5bb14f965ca4cbbe99ad1843df +Subproject commit 7f18168e834b2abf276c6f92ae3b27af494fcca1 From a1daa23d0f633fa6ed7f87200e03691b2b6bba31 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 15 May 2026 11:46:26 -0700 Subject: [PATCH 3/7] more --- crt/aws-c-auth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index fc4b87655..4b5cf14bf 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit fc4b87655e5cd3921f18d1859193c74af4102071 +Subproject commit 4b5cf14bfbb7d402ed89c7d614d77e924a65321f From 0df8b4d5b3b78bdc0a39bb77f365821dd0dca865 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 18 May 2026 16:33:03 -0700 Subject: [PATCH 4/7] fix test --- crt/aws-c-s3 | 2 +- pom.xml | 4 ++-- .../amazon/awssdk/crt/test/CredentialsProviderTest.java | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index f1a52b5e9..a31a65784 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit f1a52b5e960c06bd9392cb5e982c6fe04f1ce253 +Subproject commit a31a657840daffbfa7749b63cd0e2a178a6a5d9e diff --git a/pom.xml b/pom.xml index 81e7d78a6..b221cf735 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ -DOSX_ARCH_DUMMY=1 -DOSX_DEPLOYMENT_TARGET_DUMMY=1 OFF - 2.21.0 + 3.2.5 @@ -498,7 +498,7 @@ kill -Daws.crt.memory.tracing=2 -Xcheck:jni alphabetical - false + true false 0 false diff --git a/src/test/java/software/amazon/awssdk/crt/test/CredentialsProviderTest.java b/src/test/java/software/amazon/awssdk/crt/test/CredentialsProviderTest.java index 0e6e7d82b..d6bbe3db5 100644 --- a/src/test/java/software/amazon/awssdk/crt/test/CredentialsProviderTest.java +++ b/src/test/java/software/amazon/awssdk/crt/test/CredentialsProviderTest.java @@ -25,6 +25,8 @@ import java.util.List; import java.util.concurrent.*; +import software.amazon.awssdk.crt.Log; + import static org.junit.Assert.*; import static org.junit.Assert.fail; @@ -289,6 +291,7 @@ public void testCreateDestroyProfile_InvalidProfile() throws IOException { @Test public void testCreateDestroyProfile_MissingCreds() throws ExecutionException, InterruptedException, IOException { + Log.initLoggingToStderr(Log.LogLevel.Trace); Path confPath = Files.createTempFile("testCreateDestroyProfile_ValidProfile_conf_", ""); Path credsPath = Files.createTempFile("testCreateDestroyProfile_ValidProfile_creds_", ""); Files.write(credsPath, Arrays.asList("[default]")); // Contains a section header but no actual credentials @@ -297,18 +300,18 @@ public void testCreateDestroyProfile_MissingCreds() throws ExecutionException, I .withConfigFileNameOverride(confPath.toString()).withCredentialsFileNameOverride(credsPath.toString()); try (ProfileCredentialsProvider provider = builder.build()) { - assertNotNull(provider); + assertNotNull("provider is null", provider); assertTrue(provider.getNativeHandle() != 0); try { provider.getCredentials().join(); fail("Expected credential fetching to throw an exception since creds are missing from profile"); } catch (CompletionException e) { - assertNotNull(e.getCause()); + assertNotNull("exception is null", e.getCause()); Throwable innerException = e.getCause(); // Check that the right exception type caused the completion error in the future - assertTrue(innerException.getMessage().contains("Parser encountered an error")); + assertEquals(innerException.getMessage(), "Valid credentials could not be sourced by a profile provider"); assertEquals(CrtRuntimeException.class, innerException.getClass()); } } finally { From c2a92f067ea0e020c904df533ff5d3e375349340 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Thu, 21 May 2026 17:04:42 -0700 Subject: [PATCH 5/7] up modules --- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-event-stream | 2 +- crt/aws-c-http | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 4b5cf14bf..4cb7127fc 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 4b5cf14bfbb7d402ed89c7d614d77e924a65321f +Subproject commit 4cb7127fc2fe402310f9b2ccd7719baa348b2a19 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 1cb941215..9edd8eac2 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 1cb9412158890201a6ffceed779f90fe1f48180c +Subproject commit 9edd8eac2b21ca6a04535b91d60d361c2f1bb60f diff --git a/crt/aws-c-common b/crt/aws-c-common index 7f18168e8..d3b926fd8 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 7f18168e834b2abf276c6f92ae3b27af494fcca1 +Subproject commit d3b926fd87e6c37887ae12bb2253550334e7445a diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream index 66cafb1d8..51bef3c44 160000 --- a/crt/aws-c-event-stream +++ b/crt/aws-c-event-stream @@ -1 +1 @@ -Subproject commit 66cafb1d8bb1bfeb62a7601ce03d1a6fcd4798ed +Subproject commit 51bef3c44e1058b1689751539170b2e0f589ccdb diff --git a/crt/aws-c-http b/crt/aws-c-http index 2a22c94f7..8aefd899f 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 2a22c94f71bfca8dd954ad4fdd96150a3d23efa8 +Subproject commit 8aefd899fc3210bfd0e3fd414011a3cb708bf6e4 From c33818101e73c64c71c03efb249486059ad57377 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Fri, 22 May 2026 00:49:52 -0700 Subject: [PATCH 6/7] revert surefire upgrade --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b221cf735..81e7d78a6 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ -DOSX_ARCH_DUMMY=1 -DOSX_DEPLOYMENT_TARGET_DUMMY=1 OFF - 3.2.5 + 2.21.0 @@ -498,7 +498,7 @@ kill -Daws.crt.memory.tracing=2 -Xcheck:jni alphabetical - true + false false 0 false From aa49f4c42c73ebba55f469b431f2116a8a3edf74 Mon Sep 17 00:00:00 2001 From: Dengke Tang Date: Fri, 22 May 2026 09:36:50 -0700 Subject: [PATCH 7/7] remove the log --- .../software/amazon/awssdk/crt/test/CredentialsProviderTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/software/amazon/awssdk/crt/test/CredentialsProviderTest.java b/src/test/java/software/amazon/awssdk/crt/test/CredentialsProviderTest.java index d6bbe3db5..0f90b0b26 100644 --- a/src/test/java/software/amazon/awssdk/crt/test/CredentialsProviderTest.java +++ b/src/test/java/software/amazon/awssdk/crt/test/CredentialsProviderTest.java @@ -291,7 +291,6 @@ public void testCreateDestroyProfile_InvalidProfile() throws IOException { @Test public void testCreateDestroyProfile_MissingCreds() throws ExecutionException, InterruptedException, IOException { - Log.initLoggingToStderr(Log.LogLevel.Trace); Path confPath = Files.createTempFile("testCreateDestroyProfile_ValidProfile_conf_", ""); Path credsPath = Files.createTempFile("testCreateDestroyProfile_ValidProfile_creds_", ""); Files.write(credsPath, Arrays.asList("[default]")); // Contains a section header but no actual credentials