Chore/maintenance for 5.2.0 ctd by afranken · Pull Request #3094 · adobe/S3Mock

afranken · 2026-07-04T15:11:17Z

Description

This PR performs maintenance work for the 5.2.0 line by modernizing how the S3Mock OCI/Docker image is built (moving from a dedicated docker/ Maven module and shell scripts to Spring Boot Buildpacks), and by removing unused build/dependency scaffolding that existed to support the old image build.

Changes:

Replace the legacy docker/ module + docker buildx scripts with Spring Boot Maven plugin build-image profiles in server/ (including multi-arch release publishing).
Drop the unused software.amazon.awssdk:s3 dependency from the server module and depend only on the AWS helper modules actually used (checksums, regions, utils, plus aws-crt-client for CRC64NVME).
Remove reactor/build-order “docker module” dependencies from integration-tests and testsupport/testcontainers, and adjust integration test container memory for Buildpack images.
increase test coverage in server module
various cleanups, fixes, correctness etc.

Related Issue

N/A

Motivation and Context

Wanted to do this for a long time, never got around to it.

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)
Refactor

Checklist:

I have signed the Adobe Open Source CLA.
My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

…ency

Java LSP is based on Eclipse.

Use spring-boot-maven-plugin with paketo buildpacks. This increases Docker image size, will try to optimize later.

Copilot

Pull request overview

This PR performs maintenance work for the 5.2.0 line by modernizing how the S3Mock OCI/Docker image is built (moving from a dedicated docker/ Maven module and shell scripts to Spring Boot Buildpacks), and by removing unused build/dependency scaffolding that existed to support the old image build.

Changes:

Replace the legacy docker/ module + docker buildx scripts with Spring Boot Maven plugin build-image profiles in server/ (including multi-arch release publishing).
Drop the unused software.amazon.awssdk:s3 dependency from the server module and depend only on the AWS helper modules actually used (checksums, regions, utils, plus aws-crt-client for CRC64NVME).
Remove reactor/build-order “docker module” dependencies from integration-tests and testsupport/testcontainers, and adjust integration test container memory for Buildpack images.

Reviewed changes

Copilot reviewed 15 out of 16 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
`testsupport/testcontainers/pom.xml`	Removes the now-obsolete `s3mock-docker` dependency previously used for build ordering.
`server/pom.xml`	Drops AWS SDK `s3` dependency; adds `checksums` + `aws-crt-client`; centralizes Buildpacks image env; adds `build-docker-image` and `push-docker-image` profiles.
`pom.xml`	Removes the `docker` module and related parent-level dependency/property now superseded by server-side Buildpacks image build.
`integration-tests/pom.xml`	Removes obsolete `s3mock-docker` dependency; increases container memory for Buildpack-based runtime.
`docker/stop-buildkit.sh`	Deleted (legacy buildx helper).
`docker/start-buildkit.sh`	Deleted (legacy buildx helper).
`docker/push-docker-image.sh`	Deleted (legacy buildx helper).
`docker/pom.xml`	Deleted (entire legacy docker module removed).
`docker/Dockerfile`	Deleted (replaced by Buildpacks-based image build).
`docker/build-docker-image.sh`	Deleted (legacy buildx helper).
`CHANGELOG.md`	Documents the dependency removal and the Docker image build modernization.
`AGENTS.md`	Updates repository guidance to reflect the new Buildpacks-based OCI image build approach.
`.gitignore`	Adds `.factorypath` to ignored IDE/build artifacts.
`.github/workflows/maven-release.yml`	Adds Buildx setup and provides Docker Hub credentials for the Buildpacks publish flow during releases.
`.github/dependabot.yml`	Removes Docker ecosystem updates since the Dockerfile/module is removed.
`.github/CONTRIBUTING.md`	Updates wording to reflect “Docker image build” rather than “Dockerfile” specifics.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 39 out of 40 changed files in this pull request and generated 5 comments.

Copilot

Pull request overview

Copilot reviewed 66 out of 67 changed files in this pull request and generated 5 comments.

Copilot

Pull request overview

Copilot reviewed 67 out of 68 changed files in this pull request and generated 3 comments.

Copilot

Pull request overview

Copilot reviewed 67 out of 68 changed files in this pull request and generated 1 comment.

…n ITs Run dokka plugin only during release to keep the log volume low in CI runs.

"aws-crt" library dependency was only used for CRC64NVME checksum support.

#skip() may actually return fewer bytes.

paths.fold is a O^n runtime

The current build needs >200MB to run, use 256MB to be safe.

Copilot

Pull request overview

Copilot reviewed 67 out of 68 changed files in this pull request and generated no new comments.

afranken added 5 commits July 4, 2026 13:05

chore: remove obsolete java parameters

d0a85cd

fix: dropped the unused software.amazon.awssdk:s3 client SDK depend…

76e5ab8

…ency

chore: removed dead, unused docker-maven-plugin configuration

df57eb3

feat: ignore language server files

26a50da

Java LSP is based on Eclipse.

chore: Modernized Docker image build

32101ba

Use spring-boot-maven-plugin with paketo buildpacks. This increases Docker image size, will try to optimize later.

Copilot AI review requested due to automatic review settings July 4, 2026 15:11

Copilot started reviewing on behalf of afranken July 4, 2026 15:11 View session

Copilot AI reviewed Jul 4, 2026

View reviewed changes

Comment thread server/pom.xml Outdated

chore: reduce memory footprint of S3Mock again

5de867e

afranken self-assigned this Jul 5, 2026

afranken added the housekeeping label Jul 5, 2026

afranken requested a review from Copilot July 5, 2026 13:21

Copilot started reviewing on behalf of afranken July 5, 2026 13:22 View session

Copilot AI reviewed Jul 5, 2026

View reviewed changes

afranken force-pushed the chore/maintenance-for-5.2.0-ctd branch from 487ba39 to 1d2344b Compare July 5, 2026 13:55

afranken requested a review from Copilot July 5, 2026 18:40

Copilot started reviewing on behalf of afranken July 5, 2026 18:41 View session

Copilot AI reviewed Jul 5, 2026

View reviewed changes

afranken force-pushed the chore/maintenance-for-5.2.0-ctd branch from 452db3f to b1db57e Compare July 5, 2026 21:02

afranken requested a review from Copilot July 5, 2026 21:52

Copilot started reviewing on behalf of afranken July 5, 2026 21:53 View session

Copilot AI reviewed Jul 5, 2026

View reviewed changes

Comment thread server/src/main/kotlin/com/adobe/testing/s3mock/s3/util/Crc64Nvme.kt

Comment thread integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/S3TestBase.kt Outdated

Comment thread docs/TESTING.md

afranken force-pushed the chore/maintenance-for-5.2.0-ctd branch from cdb79c4 to 9bed037 Compare July 6, 2026 09:05

afranken requested a review from Copilot July 6, 2026 09:06

Copilot started reviewing on behalf of afranken July 6, 2026 09:06 View session

Copilot AI reviewed Jul 6, 2026

View reviewed changes

Comment thread ...rt/testcontainers/src/main/kotlin/com/adobe/testing/s3mock/testcontainers/S3MockContainer.kt

afranken added 4 commits July 6, 2026 11:25

feat: vectors support in TestContainer, use S3MockContainer to test i…

14da725

…n ITs Run dokka plugin only during release to keep the log volume low in CI runs.

chore: implement Crc64nvme to reduce fat-jar size by ~20MB

99b8f5c

"aws-crt" library dependency was only used for CRC64NVME checksum support.

chore: run make sort

8eceef3

chore: start container once per class

6600702

afranken added 18 commits July 6, 2026 11:25

chore: dropped the awssdk:regions dependency from the server module

d15cc16

chore: use bellsoft images to reduce size

830b686

fix: S3MockContainer.withVolumeAsRoot(...) runs container as root

b58370b

fix: don't create readOnlyBuffer on every read, use Kotlin trim()

8ed2d79

fix: correctness - always skip n bytes

b5e9fe6

#skip() may actually return fewer bytes.

fix: use existing path directly

e33d959

fix: use aliased import

aa5fe2e

fix: use ByteArrayOutputStream instead of paths.fold

86d2835

paths.fold is a O^n runtime

fix: add bulk read to AbstractAwsInputStream

90a5a13

chore: consolidate checksum-algorithm ↔ header mapping

2a561cc

chore: add converter tests

8ce38c9

chore: use java.util.Base64 consistently

e864db6

chore: vector controller tests

073ebed

chore: AbstractAwsInputStream tests

08806c7

chore: split ObjectMetadataHeaders from HeaderUtil

531f7a3

feat: coverage target in Makefile

466f793

feat: enforce testing of Spring components with @SpringBootTest

9367361

chore: reduce container memory to 256MB (again)

193b525

The current build needs >200MB to run, use 256MB to be safe.

afranken force-pushed the chore/maintenance-for-5.2.0-ctd branch from 9bed037 to 193b525 Compare July 6, 2026 09:25

afranken requested a review from Copilot July 6, 2026 09:42

Copilot started reviewing on behalf of afranken July 6, 2026 09:43 View session

Copilot AI reviewed Jul 6, 2026

View reviewed changes

afranken merged commit 84849c5 into main Jul 6, 2026
8 checks passed

afranken deleted the chore/maintenance-for-5.2.0-ctd branch July 6, 2026 10:10

Uh oh!

Conversation

afranken commented Jul 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

afranken commented Jul 4, 2026 •

edited

Loading