Merge branch 'main' into maven-4

.github/workflows/_template.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Setup BATS
-        uses: bats-core/bats-action@c9f3b9ab55d4711876053a7917f3311ee30366bf
+        uses: bats-core/bats-action@73f0f7d34ec09278ce76030c105fc6a8ddb1d726
       - name: Update submodules
         run: git submodule update --init
 
@@ -95,7 +95,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         # if: github.event_name != 'pull_request' # TODO
         with:
           context: ${{ inputs.directory }}

.github/workflows/sapmachine-22.yml

@@ -29,4 +29,4 @@ jobs:
     uses: ./.github/workflows/_template.yml
     with:
       directory: sapmachine-22
-    secrets: inherit
+    secrets: inherit

README.md

@@ -228,8 +228,7 @@ Build with the usual
 
     docker build -t maven .
 
-Tests are written using [bats](https://github.com/sstephenson/bats) for Linux images and [pester](https://github.com/pester/Pester) for Windows images
-(requires Pester 4.x) under the `tests` dir.
+Tests are written using [bats](https://github.com/sstephenson/bats) for Linux images and [pester](https://github.com/pester/Pester) for Windows images under the `tests` dir.
 
 Use the env var TAG to choose what image to run tests against.
 
@@ -260,7 +259,7 @@ git submodule init
 git submodule update
 ```
 
-Pester comes with most modern Windows (Windows 10 and Windows Server 2019), but is an older version than required. You may need to follow [this tutorial](https://blog.damianflynn.com/Windows10-Pester/) on upgrading Pester to 4.x.
+Pester comes with most modern Windows (Windows 10 and Windows Server 2019), but is an older version than required.
 
 
 ## Adding New Images

common.sh

@@ -3,7 +3,7 @@
 set -eu
 
 # Default values for 'latest' tag
-latestMavenVersion='3.9.7'
+latestMavenVersion='3.9.8'
 latest=''
 default_jdk=eclipse-temurin
 

github-action.ps1

@@ -1,4 +1,4 @@
-Install-Module -Name Pester -Force -RequiredVersion 5.0.4
+Install-Module -Name Pester -Force -RequiredVersion 5.6.0
 Write-Host "Starting"
 $dir = $args[0]
 $username = $args[1]