Skip to content

Commit 39b4154

Browse files
afrankenafranken
authored
Merge branch 'main' into switch-to-tomcat
2 parents 7ba7dc7 + f340beb commit 39b4154

File tree

21 files changed

+103
-66
lines changed

21 files changed

+103
-66
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ jobs:
4545

4646
steps:
4747
- name: Harden Runner
48-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
48+
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
4949
with:
5050
egress-policy: audit
5151

5252
- name: Checkout repository
53-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
53+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5454

5555
# Initializes the CodeQL tools for scanning.
5656
- name: Initialize CodeQL
57-
uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
57+
uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
5858
with:
5959
languages: ${{ matrix.language }}
6060
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +66,7 @@ jobs:
6666

6767
# Set up JDK 17, otherwise autobuild will fail below.
6868
- name: Set up JDK
69-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
69+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
7070
with:
7171
java-version: 21
7272
distribution: 'temurin'
@@ -75,7 +75,7 @@ jobs:
7575
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
7676
# If this step fails, then you should remove it and run the build manually (see below)
7777
- name: Autobuild
78-
uses: github/codeql-action/autobuild@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
78+
uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
7979

8080
# ℹ️ Command-line programs to run using the OS shell.
8181
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -88,4 +88,4 @@ jobs:
8888
# ./location_of_script_within_repo/buildscript.sh
8989

9090
- name: Perform CodeQL Analysis
91-
uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
91+
uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6

‎.github/workflows/dependency-review.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name: 'Dependency Review'
1010
on: [pull_request]
1111

1212
permissions:
13-
contents: read
13+
contents: write
1414

1515
concurrency:
1616
group: dependency-review-${{ github.ref }}
@@ -21,11 +21,11 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Harden Runner
24-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
24+
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
2525
with:
2626
egress-policy: audit
2727

2828
- name: 'Checkout Repository'
29-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
29+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3030
- name: 'Dependency Review'
31-
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
31+
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0

‎.github/workflows/maven-ci-and-prb.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ jobs:
3737

3838
steps:
3939
- name: Harden Runner
40-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
40+
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
4141
with:
4242
egress-policy: audit
4343

44-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
44+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4545
with:
4646
fetch-depth: 0
4747
- name: Set up JDK
48-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
48+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
4949
with:
5050
java-version: 21
5151
distribution: 'temurin'

‎.github/workflows/maven-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525

2626
steps:
2727
- name: Harden Runner
28-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
28+
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
2929
with:
3030
egress-policy: audit
3131

32-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
32+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3333
with:
3434
fetch-depth: 0
3535
- name: Set up JDK
36-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
36+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
3737
with:
3838
java-version: 21
3939
distribution: 'temurin'

‎.github/workflows/sbom.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Harden Runner
16-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
16+
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
1717
with:
1818
egress-policy: audit
19-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
19+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
with:
2121
fetch-depth: 0
2222
- uses: advanced-security/sbom-generator-action@375dee8e6144d9fd0ec1f5667b4f6fb4faacefed # v0.0.1

‎.github/workflows/scorecards.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535

3636
steps:
3737
- name: Harden Runner
38-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
38+
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
3939
with:
4040
egress-policy: audit
4141

4242
- name: "Checkout code"
43-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
43+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4444
with:
4545
persist-credentials: false
4646

@@ -75,6 +75,6 @@ jobs:
7575

7676
# Upload the results to GitHub's code scanning dashboard.
7777
- name: "Upload to code-scanning"
78-
uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
78+
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
7979
with:
8080
sarif_file: results.sarif

‎.github/workflows/upload-dependencies-of-dependenices.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Harden Runner
17-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
17+
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
1818
with:
1919
egress-policy: audit
20-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
20+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121
with:
2222
fetch-depth: 0
2323
- name: Set up JDK
24-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
24+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
2525
with:
2626
java-version: 21
2727
distribution: 'temurin'

‎.mvn/jvm.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
--add-opens=java.base/java.lang=ALL-UNNAMED
3+
--add-opens=java.base/java.io=ALL-UNNAMED

‎CHANGELOG.md‎

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88

99
<!-- TOC -->
1010
* [Changelog](#changelog)
11-
* [PLANNED - 4.x - RELEASE TBD](#planned---4x---release-tbd)
11+
* [PLANNED - 5.x - RELEASE TBD](#planned---5x---release-tbd)
1212
* [Planned changes](#planned-changes)
13-
* [CURRENT - 3.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT](#current---3x---this-version-is-under-active-development)
14-
* [3.12.0 - PLANNED](#3120---planned)
13+
* [CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT](#current---4x---this-version-is-under-active-development)
14+
* [4.0.0 - PLANNED](#400---planned)
15+
* [DEPRECATED - 3.x](#deprecated---3x)
16+
* [3.12.0](#3120)
1517
* [3.11.0](#3110)
1618
* [3.10.3](#3103)
1719
* [3.10.2](#3102)
@@ -98,8 +100,8 @@
98100
* [1.0.0](#100)
99101
<!-- TOC -->
100102

101-
# PLANNED - 4.x - RELEASE TBD
102-
Version 4.x is JDK17 LTS bytecode compatible (maybe JDK21 LTS, depending on the release date), with Docker integration.
103+
# PLANNED - 5.x - RELEASE TBD
104+
Version 5.x is JDK17 LTS bytecode compatible (maybe JDK21 LTS, depending on the release date), with Docker integration.
103105

104106
Any JUnit / direct Java usage support will most likely be dropped and only supported on a best-effort basis.
105107
(i.e. the modules will be deleted from the code base and not released anymore. It *may* be possible to
@@ -109,7 +111,7 @@ to easily to run `S3MockApplication#start` from a static context. These workarou
109111

110112
Running S3Mock in unit tests is still supported by using [TestContainers](https://www.testcontainers.org/).
111113

112-
**Once 4.x is released, 3.x may receive bug fixes and features, this will be best-effort only.**
114+
**Once 5.x is released, 4.x may receive bug fixes and features, this will be best-effort only.**
113115

114116
### Planned changes
115117

@@ -126,24 +128,56 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
126128
* Bump Spring Framework version to 7.x
127129
* Bump java version from 17 to (?)
128130

129-
# CURRENT - 3.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT
131+
# CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT
132+
Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
133+
134+
**The current major version 4 will receive new features, dependency updates and bug fixes on a continuous basis.**
135+
136+
### 4.0.0 - PLANNED
137+
138+
* Features and fixes
139+
* TBD
140+
* Refactorings
141+
* Use Tomcat instead of Jetty (fixes #2136)
142+
* Version updates (deliverable dependencies)
143+
* Spring Boot to 3.4
144+
145+
# DEPRECATED - 3.x
130146
Version 3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
131147

132-
**The current major version 3 will receive new features, dependency updates and bug fixes on a continuous basis.**
148+
**3.x is DEPRECATED and may receive bug fixes and features, this will be best-effort only.**
133149

134-
## 3.12.0 - PLANNED
150+
## 3.12.0
135151
3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
136152

137153
* Features and fixes
138-
* Support Versions in APIs
139-
* Add "DeleteObjectTagging" API
140-
* Support "Ownership" in buckets. ACLs should be
154+
* none
141155
* Refactorings
142-
* TBD
156+
* none
143157
* Version updates (deliverable dependencies)
144-
* TBD
158+
* Bump aws-v2.version from 2.28.11 to 2.29.29
159+
* Bump aws.version from 1.12.772 to 1.12.779
160+
* Bump kotlin.version from 2.0.20 to 2.1.0
161+
* Bump com.fasterxml.jackson:jackson-bom from 2.18.0 to 2.18.2
162+
* Bump commons-io:commons-io from 2.17.0 to 2.18.0
163+
* Bump testcontainers.version from 1.20.1 to 1.20.4
164+
* Bump alpine from 3.20.3 to 3.21.0 in /docker
145165
* Version updates (build dependencies)
146-
* TBD
166+
* Bump io.fabric8:docker-maven-plugin from 0.45.0 to 0.45.1
167+
* Bump com.puppycrawl.tools:checkstyle from 10.18.1 to 10.20.2
168+
* Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.0 to 3.11.2
169+
* Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.0 to 3.5.2
170+
* Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.0 to 3.5.2
171+
* Bump org.apache.maven.plugins:maven-dependency-plugin from 3.8.0 to 3.8.1
172+
* Bump org.apache.maven.plugins:maven-checkstyle-plugin from 3.5.0 to 3.6.0
173+
* Bump org.codehaus.mojo:exec-maven-plugin from 3.4.1 to 3.5.0
174+
* Bump actions/dependency-review-action from 4.3.4 to 4.5.0
175+
* Bump actions/setup-java from 4.4.0 to 4.5.0
176+
* Bump actions/upload-artifact from 3.1.0 to 4.4.3
177+
* Bump actions/checkout from 4.2.0 to 4.2.2
178+
* Bump github/codeql-action from 3.26.9 to 3.27.6
179+
* Bump advanced-security/maven-dependency-submission-action from 3.0.3 to 4.1.1
180+
* Bump step-security/harden-runner from 2.10.1 to 2.10.2
147181

148182
## 3.11.0
149183
3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.

‎build-config/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.adobe.testing</groupId>
2323
<artifactId>s3mock-parent</artifactId>
24-
<version>3.11.1-SNAPSHOT</version>
24+
<version>3.12.1-SNAPSHOT</version>
2525
</parent>
2626

2727
<artifactId>s3mock-build-config</artifactId>

0 commit comments

Comments
 (0)