From 9be90f1621dbe985ff7706d70c0dd298699d27b7 Mon Sep 17 00:00:00 2001 From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com> Date: Mon, 15 Dec 2025 16:51:45 -0800 Subject: [PATCH 1/5] chore: bump java commit --- .gitmodules | 2 +- test-server/java-v3-transition-server/s3ec-staging | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a88a83f9..5a34d2af 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,7 +18,7 @@ [submodule "test-server/java-v3-transition-server/s3ec-staging"] path = test-server/java-v3-transition-server/s3ec-staging url = git@github.com:aws/private-amazon-s3-encryption-client-java-staging.git - branch = imabhichow/transition-read-kc + branch = imabhichow/transition-read-kc-merge [submodule "test-server/java-v4-server/s3ec-staging"] path = test-server/java-v4-server/s3ec-staging url = git@github.com:aws/private-amazon-s3-encryption-client-java-staging.git diff --git a/test-server/java-v3-transition-server/s3ec-staging b/test-server/java-v3-transition-server/s3ec-staging index 183f1984..c7fdc483 160000 --- a/test-server/java-v3-transition-server/s3ec-staging +++ b/test-server/java-v3-transition-server/s3ec-staging @@ -1 +1 @@ -Subproject commit 183f1984ed1679e8aa4cb368aeda66f2131a2061 +Subproject commit c7fdc483bd113b5e37e23f92ed0296702464506b From 1f95aad31a0436a002dee38cf8ddf99b27cdb170 Mon Sep 17 00:00:00 2001 From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com> Date: Mon, 15 Dec 2025 17:16:24 -0800 Subject: [PATCH 2/5] chore: bump java commit --- all-examples/java/v3/build.gradle.kts | 2 +- test-server/java-v3-transition-server/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/all-examples/java/v3/build.gradle.kts b/all-examples/java/v3/build.gradle.kts index f0748625..9a4e35da 100644 --- a/all-examples/java/v3/build.gradle.kts +++ b/all-examples/java/v3/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { implementation("software.amazon.awssdk:auth") // S3 Encryption Client v3 from local Maven repository - implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0-read-kc") + implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.5.0-TRANSITION") } application { diff --git a/test-server/java-v3-transition-server/build.gradle.kts b/test-server/java-v3-transition-server/build.gradle.kts index 7f249d65..09413acd 100644 --- a/test-server/java-v3-transition-server/build.gradle.kts +++ b/test-server/java-v3-transition-server/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { implementation("software.amazon.smithy.java:aws-server-restjson:$smithyJavaVersion") // S3EC from local Maven repository (installed by mvn install) - implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0-read-kc") + implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.5.0-TRANSITION") } // Use that application plugin to start the service via the `run` task. From d116eeec1da01a58324438e06c0fb6159bc5265a Mon Sep 17 00:00:00 2001 From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com> Date: Tue, 16 Dec 2025 10:50:33 -0800 Subject: [PATCH 3/5] bump to latest java commit --- test-server/java-v3-transition-server/s3ec-staging | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-server/java-v3-transition-server/s3ec-staging b/test-server/java-v3-transition-server/s3ec-staging index c7fdc483..4623c7c9 160000 --- a/test-server/java-v3-transition-server/s3ec-staging +++ b/test-server/java-v3-transition-server/s3ec-staging @@ -1 +1 @@ -Subproject commit c7fdc483bd113b5e37e23f92ed0296702464506b +Subproject commit 4623c7c98b653474c989fe16e499b4874eeaeaa0 From e8beb7853c9bd303aa26bb5d7b90e1dff82be8eb Mon Sep 17 00:00:00 2001 From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com> Date: Tue, 16 Dec 2025 11:42:00 -0800 Subject: [PATCH 4/5] Revert "bump to latest java commit" This reverts commit d116eeec1da01a58324438e06c0fb6159bc5265a. --- test-server/java-v3-transition-server/s3ec-staging | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-server/java-v3-transition-server/s3ec-staging b/test-server/java-v3-transition-server/s3ec-staging index 4623c7c9..c7fdc483 160000 --- a/test-server/java-v3-transition-server/s3ec-staging +++ b/test-server/java-v3-transition-server/s3ec-staging @@ -1 +1 @@ -Subproject commit 4623c7c98b653474c989fe16e499b4874eeaeaa0 +Subproject commit c7fdc483bd113b5e37e23f92ed0296702464506b From 381ac0fe2ceae5395df4ed56030c6e136a81adfa Mon Sep 17 00:00:00 2001 From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com> Date: Tue, 16 Dec 2025 11:44:26 -0800 Subject: [PATCH 5/5] improved commit --- all-examples/java/v4/build.gradle.kts | 2 +- test-server/java-v4-server/build.gradle.kts | 2 +- test-server/java-v4-server/s3ec-staging | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/all-examples/java/v4/build.gradle.kts b/all-examples/java/v4/build.gradle.kts index 56b02b97..e20d0976 100644 --- a/all-examples/java/v4/build.gradle.kts +++ b/all-examples/java/v4/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { implementation("software.amazon.awssdk:auth") // S3 Encryption Client v4 from local Maven repository - implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0-add-kc") + implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.6.0") } application { diff --git a/test-server/java-v4-server/build.gradle.kts b/test-server/java-v4-server/build.gradle.kts index fcb3c3ca..57c45ef0 100644 --- a/test-server/java-v4-server/build.gradle.kts +++ b/test-server/java-v4-server/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { implementation("software.amazon.smithy.java:aws-server-restjson:$smithyJavaVersion") // S3EC from local Maven repository (installed by mvn install) - implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0-add-kc") + implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.6.0") } // Use that application plugin to start the service via the `run` task. diff --git a/test-server/java-v4-server/s3ec-staging b/test-server/java-v4-server/s3ec-staging index 7a1899bb..f3e490e1 160000 --- a/test-server/java-v4-server/s3ec-staging +++ b/test-server/java-v4-server/s3ec-staging @@ -1 +1 @@ -Subproject commit 7a1899bb8be6f137a3031ff76f2a1bf3f278e98d +Subproject commit f3e490e19d3c51aa4a8ef87686693cd1ae2f9f6c