Merge pull request #2529 from adobe/test-coverage-and-improvements

Test coverage and improvements

Author: afranken

.pre-commit-config.yaml

@@ -1,3 +1,19 @@
+#
+#  Copyright 2017-2025 Adobe.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#          http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
 repos:
 - repo: https://github.com/gherynos/pre-commit-java
   rev: v0.6.16

CHANGELOG.md

@@ -8,7 +8,8 @@ Whenever a 3rd party library is updated, S3Mock will update it's MINOR version.
 * [PLANNED - 5.x - RELEASE TBD](#planned---5x---release-tbd)
   * [Planned changes](#planned-changes)
 * [CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT](#current---4x---this-version-is-under-active-development)
-  * [4.7.0 - PLANNED](#470---planned)
+  * [4.8.0 - PLANNED](#480---planned)
+  * [4.7.0](#470)
   * [4.6.0](#460)
   * [4.5.1](#451)
   * [4.5.0](#450)
@@ -147,7 +148,7 @@ Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
 
 **The current major version 4 will receive new features, dependency updates and bug fixes on a continuous basis.**
 
-## 4.7.0 - PLANNED
+## 4.8.0 - PLANNED
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
 * Features and fixes
@@ -159,6 +160,27 @@ Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
 * Version updates (build dependencies)
   * TBD
 
+## 4.7.0
+Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
+
+* Features and fixes
+  * Fix store property overrides for "com.adobe.testing.s3mock.store" properties. (Fixes #2524)
+* Refactorings
+  * Enable Spring Boot Actuator in "debug" and "trace" profiles.
+  * Enable [Spring Test Profiler](https://github.com/PragmaTech-GmbH/spring-test-profiler) during test runs.
+* Version updates (deliverable dependencies)
+  * Bump spring-boot.version from 3.5.3 to 3.5.4
+  * Bump aws-v2.version from 2.31.77 to 2.32.7
+  * Bump aws.version from 1.12.787 to 1.12.788
+  * Bump commons-io:commons-io from 2.19.0 to 2.20.0
+  * Bump alpine from 3.22.0 to 3.22.1 in /docker
+* Version updates (build dependencies)
+  * Bump aws.sdk.kotlin:s3-jvm from 1.4.109 to 1.4.125
+  * Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.6.0 to 3.6.1
+  * Bump org.mockito.kotlin:mockito-kotlin from 5.4.0 to 6.0.0
+  * Bump step-security/harden-runner from 2.12.2 to 2.13.0
+  * Bump github/codeql-action from 3.29.2 to 3.29.4
+
 ## 4.6.0
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 

Makefile

@@ -1,3 +1,19 @@
+#
+#  Copyright 2017-2025 Adobe.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#          http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
 .PHONY: build verify install
 .DEFAULT_GOAL := build
 

build-config/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.6.1-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-build-config</artifactId>

docker/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.6.1-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-docker</artifactId>

integration-tests/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.6.1-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-integration-tests</artifactId>

pom.xml

@@ -21,7 +21,7 @@
 
   <groupId>com.adobe.testing</groupId>
   <artifactId>s3mock-parent</artifactId>
-  <version>4.6.1-SNAPSHOT</version>
+  <version>4.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>S3Mock - Parent</name>
@@ -87,7 +87,7 @@
 
     <aws.version>1.12.788</aws.version>
 
-    <aws-kotlin.version>1.4.119</aws-kotlin.version>
+    <aws-kotlin.version>1.4.125</aws-kotlin.version>
 
     <commons-codec.version>1.15</commons-codec.version>
     <commons-compress.version>1.27.1</commons-compress.version>
@@ -131,6 +131,7 @@
     <testcontainers.version>1.21.3</testcontainers.version>
     <testng.version>7.11.0</testng.version>
     <xmlunit-assertj3.version>2.10.3</xmlunit-assertj3.version>
+    <spring-test-profiler.version>0.0.5</spring-test-profiler.version>
   </properties>
 
   <dependencyManagement>
@@ -321,6 +322,12 @@
         <artifactId>mockito-core</artifactId>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>digital.pragmatech.testing</groupId>
+        <artifactId>spring-test-profiler</artifactId>
+        <version>${spring-test-profiler.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

server/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.6.1-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock</artifactId>
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
-      <scope>test</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -149,6 +149,11 @@
       <artifactId>mockito-kotlin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>digital.pragmatech.testing</groupId>
+      <artifactId>spring-test-profiler</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

server/src/main/resources/application-debug.properties

@@ -22,6 +22,11 @@ spring.mvc.log-request-details=true
 
 # Enable JMX  when debugging
 spring.jmx.enabled=true
+spring.jmx.unique-names=true
 
 # Enable all actuator endpoints when debugging
+management.endpoints.web.discovery.enabled=true
+management.endpoints.jmx.exposure.include=*
 management.endpoints.web.exposure.include=*
+management.endpoints.access.default=unrestricted
+management.endpoint.health.show-details=always

server/src/main/resources/application-trace.properties

@@ -21,6 +21,11 @@ spring.mvc.log-request-details=true
 
 # Enable JMX  when debugging
 spring.jmx.enabled=true
+spring.jmx.unique-names=true
 
 # Enable all actuator endpoints when debugging
+management.endpoints.web.discovery.enabled=true
+management.endpoints.jmx.exposure.include=*
 management.endpoints.web.exposure.include=*
+management.endpoints.access.default=unrestricted
+management.endpoint.health.show-details=always