From 6527c143f5f4f8319a9fc7cb4e7cbd5406040bc8 Mon Sep 17 00:00:00 2001
From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com>
Date: Thu, 25 Sep 2025 15:50:08 -0700
Subject: [PATCH 1/3] chore(test-server): Have Java link to local private
 submodule

# Conflicts:
#	.gitmodules
---
 .gitmodules                                 |  3 +++
 test-server/java-v3-server/Makefile         | 10 ++++++++--
 test-server/java-v3-server/build.gradle.kts |  2 +-
 test-server/java-v3-server/s3ec-staging     |  1 +
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 160000 test-server/java-v3-server/s3ec-staging

diff --git a/.gitmodules b/.gitmodules
index ce2abc73..932d3235 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,3 +12,6 @@
 	path = test-server/php-v3-server/local-php-sdk
 	url = git@github.com:aws/private-aws-sdk-php-staging.git
 	branch = s3ec/improved
+[submodule "test-server/java-v3-server/s3ec-staging"]
+	path = test-server/java-v3-server/s3ec-staging
+	url = git@github.com:aws/private-amazon-s3-encryption-client-java-staging.git
diff --git a/test-server/java-v3-server/Makefile b/test-server/java-v3-server/Makefile
index 1e0dc763..b93dd2ce 100644
--- a/test-server/java-v3-server/Makefile
+++ b/test-server/java-v3-server/Makefile
@@ -1,11 +1,17 @@
 # Makefile for S3 Encryption Client Testing
 
-.PHONY: start-server stop-server wait-for-server
+.PHONY: start-server stop-server wait-for-server build-s3ec
 
 PID_FILE := server.pid
 PORT := 8080
 
-start-server:
+build-s3ec:
+	@echo "Building S3EC from source..."
+	cd s3ec-staging && mvn --batch-mode -no-transfer-progress clean compile
+	cd s3ec-staging && mvn -B -ntp install -DskipTests
+	@echo "S3EC build completed."
+
+start-server: build-s3ec
 	@echo "Starting Java V3 server..."
 	AWS_ACCESS_KEY_ID="$$AWS_ACCESS_KEY_ID" \
 	AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
diff --git a/test-server/java-v3-server/build.gradle.kts b/test-server/java-v3-server/build.gradle.kts
index ca793e56..fbd5bdb9 100644
--- a/test-server/java-v3-server/build.gradle.kts
+++ b/test-server/java-v3-server/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     implementation("software.amazon.smithy.java:aws-server-restjson:$smithyJavaVersion")
 
     compileOnly("software.amazon.awssdk:aws-sdk-java:2.31.66")
-    implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.3.5")
+    implementation(files("s3ec-staging/target/amazon-s3-encryption-client-java-3.4.0.jar"))
 }
 
 // Use that application plugin to start the service via the `run` task.
diff --git a/test-server/java-v3-server/s3ec-staging b/test-server/java-v3-server/s3ec-staging
new file mode 160000
index 00000000..ab41a578
--- /dev/null
+++ b/test-server/java-v3-server/s3ec-staging
@@ -0,0 +1 @@
+Subproject commit ab41a57882f674768c4f528a9069cf69aeb9a53f

From 2a7d30463b13de2b04b27eb853df9987ca863696 Mon Sep 17 00:00:00 2001
From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com>
Date: Thu, 25 Sep 2025 15:58:47 -0700
Subject: [PATCH 2/3] add branch

---
 .gitmodules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmodules b/.gitmodules
index 932d3235..c4b2a4f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,3 +15,4 @@
 [submodule "test-server/java-v3-server/s3ec-staging"]
 	path = test-server/java-v3-server/s3ec-staging
 	url = git@github.com:aws/private-amazon-s3-encryption-client-java-staging.git
+	branch = s3ec/transitional

From 50aedb204e8f41046c43fd8198eddaef7485c119 Mon Sep 17 00:00:00 2001
From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com>
Date: Mon, 29 Sep 2025 02:58:11 -0700
Subject: [PATCH 3/3] allow local testing

---
 test-server/java-v3-server/build.gradle.kts | 4 ++--
 test-server/java-v3-server/s3ec-staging     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test-server/java-v3-server/build.gradle.kts b/test-server/java-v3-server/build.gradle.kts
index fbd5bdb9..b874d8e2 100644
--- a/test-server/java-v3-server/build.gradle.kts
+++ b/test-server/java-v3-server/build.gradle.kts
@@ -13,8 +13,8 @@ dependencies {
     implementation("software.amazon.smithy.java:server-netty:$smithyJavaVersion")
     implementation("software.amazon.smithy.java:aws-server-restjson:$smithyJavaVersion")
 
-    compileOnly("software.amazon.awssdk:aws-sdk-java:2.31.66")
-    implementation(files("s3ec-staging/target/amazon-s3-encryption-client-java-3.4.0.jar"))
+    // S3EC from local Maven repository (installed by mvn install)
+    implementation("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.4.0-SNAPSHOT")
 }
 
 // Use that application plugin to start the service via the `run` task.
diff --git a/test-server/java-v3-server/s3ec-staging b/test-server/java-v3-server/s3ec-staging
index ab41a578..c572d958 160000
--- a/test-server/java-v3-server/s3ec-staging
+++ b/test-server/java-v3-server/s3ec-staging
@@ -1 +1 @@
-Subproject commit ab41a57882f674768c4f528a9069cf69aeb9a53f
+Subproject commit c572d9587ee934aad6a2fe8091a72080846d32af