Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@
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
branch = s3ec/transitional
10 changes: 8 additions & 2 deletions test-server/java-v3-server/Makefile
Original file line number Diff line number Diff line change
@@ -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" \
Expand Down
4 changes: 2 additions & 2 deletions test-server/java-v3-server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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("software.amazon.encryption.s3:amazon-s3-encryption-client-java:3.3.5")
// 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.
Expand Down
1 change: 1 addition & 0 deletions test-server/java-v3-server/s3ec-staging
Submodule s3ec-staging added at c572d9
Loading