Add employee search 3

.github/workflows/build.yml

@@ -16,9 +16,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Checkout git repository
-                uses: actions/checkout@v4.1.6
+                uses: actions/checkout@v7
             -   name: Setup python
-                uses: actions/setup-python@v6
+                uses: actions/setup-python@v7
                 with:
                     python-version: "3.9"
             -   name: Setup Java
@@ -39,7 +39,7 @@ jobs:
                 os: [ windows-latest, ubuntu-latest, macos-15-intel ]
             max-parallel: 1
         steps:
-            -   uses: actions/checkout@v4.1.6
+            -   uses: actions/checkout@v7
             -   name: Set up JDK
                 uses: ./.github/actions/java-setup
                 with:

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
     environment:
       name: release
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - name: Set up JDK
         uses: ./.github/actions/java-setup
@@ -31,7 +31,7 @@ jobs:
           mvn --no-transfer-progress install -DskipTests
 
       - name: "Create release"
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v3
         with:
           draft: false
           files: |
@@ -65,21 +65,21 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v3.6.0
+        uses: docker/setup-qemu-action@v4.2.0
         with:
           platforms: all
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: "Login to dockerhub"
-        uses: docker/login-action@v3.6.0
+        uses: docker/login-action@v4.6.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Build and push WebGoat"
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@v7.3.0
         with:
           context: ./
           file: ./Dockerfile
@@ -92,7 +92,7 @@ jobs:
             webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
 
       - name: "Build and push WebGoat desktop"
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@v7.3.0
         with:
           context: ./
           file: ./Dockerfile_desktop
@@ -109,7 +109,7 @@ jobs:
     needs: [ release ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -123,15 +123,15 @@ jobs:
           mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}-SNAPSHOT versions:commit
 
       - name: Push the changes to new branch
-        uses: devops-infra/action-commit-push@v0.11.4
+        uses: devops-infra/action-commit-push@v1.5.0
         with:
             github_token: "${{ secrets.GITHUB_TOKEN }}"
             add_timestamp: true
             commit_message: "Updating to the new development version"
             force: false
 
       - name: Create PR
-        uses: devops-infra/action-pull-request@v1.0.2
+        uses: devops-infra/action-pull-request@v1.4.0
         with:
             github_token: "${{ secrets.GITHUB_TOKEN }}"
             title: ${{ github.event.commits[0].message }}

Dockerfile_desktop

@@ -1,6 +1,6 @@
 # Builder stage to download OWASP ZAP once per version
-FROM alpine:3.22 AS zap
-ARG ZAP_VERSION=2.16.1
+FROM alpine:3.24.1 AS zap
+ARG ZAP_VERSION=2.17.0
 RUN apk add --no-cache curl tar \
   && set -eux; \
      curl -sSL "https://github.com/zaproxy/zaproxy/releases/download/v${ZAP_VERSION}/ZAP_${ZAP_VERSION}_Linux.tar.gz" -o /tmp/zap.tgz; \
@@ -9,9 +9,9 @@ RUN apk add --no-cache curl tar \
      rm -f /tmp/zap.tgz
 
 # Builder stage to fetch a JRE suited for the target architecture
-FROM alpine:3.22 AS jre
-ARG JAVA_MAJOR=23
-ARG JAVA_FULL=23.0.1+11
+FROM alpine:3.24.1 AS jre
+ARG JAVA_MAJOR=25
+ARG JAVA_FULL=25.0.3.0
 ARG TARGETARCH
 RUN apk add --no-cache curl tar \
   && set -eux; \
@@ -22,19 +22,17 @@ RUN apk add --no-cache curl tar \
      esac; \
      JAVA_ENC="${JAVA_FULL//+/%2B}"; \
      JAVA_FILE="${JAVA_FULL//+/_}"; \
-     curl -sSL "https://github.com/adoptium/temurin${JAVA_MAJOR}-binaries/releases/download/jdk-${JAVA_ENC}/OpenJDK${JAVA_MAJOR}U-jre_${ARCH}_linux_hotspot_${JAVA_FILE}.tar.gz" -o /tmp/java.tgz; \
+     curl -sSL "https://github.com/AdoptOpenJDK/semeru${JAVA_MAJOR}-binaries/releases/download/jdk-${JAVA_ENC}/ibm-semeru-open-jre_${ARCH}_linux_${JAVA_ENC}.tar.gz" -o /tmp/java.tgz; \
      mkdir -p /jre; \
      tar -xzf /tmp/java.tgz -C /jre --strip-components=1; \
      rm -f /tmp/java.tgz
 
 # Final runtime image
-FROM lscr.io/linuxserver/webtop:ubuntu-xfce
+FROM lscr.io/linuxserver/webtop:ubuntu-kde
 LABEL name="WebGoat: A deliberately insecure Web Application"
 LABEL maintainer="WebGoat team"
 
-ARG ZAP_VERSION=2.16.1
-ARG JAVA_MAJOR=23
-ARG JAVA_FULL=23.0.1+11
+ARG ZAP_VERSION=2.17.0
 ENV ZAP_VERSION=${ZAP_VERSION} \
     JAVA_HOME=/config/java-jdk \
     PATH="${PATH}:/config/java-jdk/bin" \

README.md

@@ -120,6 +120,8 @@ git checkout <<branch_name>>
 # On Windows:
 ./mvnw.cmd clean install
 
+If you have ran WebGoat before, you should first run mvn clean -Pcleanall to clean up files from your temp and home directories which could fail the tests due to changes in lessons!
+
 # Using docker or podman, you can than build the container locally
 docker build -f Dockerfile . -t webgoat/webgoat
 ```