Delete .github/workflows directory

# Description of Changes

Please provide a summary of the changes, including:

- What was changed
- Why the change was made
- Any challenges encountered

Closes #(issue_number)

---

## Checklist

### General

- [ ] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [ ] I have read the [Stirling-PDF Developer
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md)
(if applicable)
- [ ] I have read the [How to add new languages to
Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md)
(if applicable)
- [ ] I have performed a self-review of my own code
- [ ] My changes generate no new warnings

### Documentation

- [ ] I have updated relevant docs on [Stirling-PDF's doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
(if functionality has heavily changed)
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)

### UI Changes (if applicable)

- [ ] Screenshots or videos demonstrating the UI changes are attached
(e.g., as comments or direct attachments in the PR)

### Testing (if applicable)

- [ ] I have tested my changes locally. Refer to the [Testing
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing)
for more details.

.devcontainer/devcontainer.json

@@ -8,11 +8,29 @@
         // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
         "dockerfile": "../Dockerfile.dev"
     },
+    "runArgs": [
+      "-e",
+      "GIT_EDITOR=code --wait",
+      "--security-opt",
+      "label=disable"
+    ],
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    "appPort": [8080],
+    "forwardPorts": [8080, 2002, 2003],
+    "portsAttributes": {
+        "8080": {
+            "label": "Stirling-PDF Dev Port"
+        },
+        "2002": {
+            "label": "unoserver Port"
+        },
+        "2003": {
+            "label": "UnoConvert Port"
+        }
+    },
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=delegated",
     "mounts": [
-      "source=logs-volume,target=/workspace/logs,type=volume"
+      "source=logs-volume,target=/workspace/logs,type=volume",
+      "source=build-volume,target=/workspace/build,type=volume"
     ],
     "workspaceFolder": "/workspace",
     // Configure tool-specific properties.
@@ -31,7 +49,7 @@
                 "java.configuration.updateBuildConfiguration": "interactive",
                 "java.format.enabled": true,
                 "java.format.settings.profile": "GoogleStyle",
-                "java.format.settings.google.version": "1.25.2",
+                "java.format.settings.google.version": "1.26.0",
                 "java.format.settings.google.extra": "--aosp --skip-sorting-imports --skip-javadoc-formatting",
                 "java.saveActions.cleanup": true,
                 "java.cleanup.actions": [
@@ -94,21 +112,20 @@
                 "ms-python.flake8", // Flake8 linter for Python to enforce code quality
                 "ms-python.python", // Official Microsoft Python extension with IntelliSense, debugging, and Jupyter support
                 "ms-vscode-remote.vscode-remote-extensionpack", // Remote Development Pack for SSH, WSL, and Containers
-                "Oracle.oracle-java", // Oracle Java extension with additional features for Java development
+                // "Oracle.oracle-java", // Oracle Java extension with additional features for Java development
                 "streetsidesoftware.code-spell-checker", // Spell checker for code to avoid typos
                 "vmware.vscode-boot-dev-pack", // Developer tools for Spring Boot by VMware
-                "vmware.vscode-spring-boot", // Spring Boot tools by VMware for enhanced Spring development
                 "vscjava.vscode-java-pack", // Java Extension Pack with essential Java tools for VS Code
-                "vscjava.vscode-spring-boot-dashboard", // Spring Boot dashboard for managing and visualizing Spring Boot applications
-                "vscjava.vscode-spring-initializr", // Support for Spring Initializr to create new Spring projects
                 "EditorConfig.EditorConfig", // EditorConfig support for maintaining consistent coding styles
                 "ms-azuretools.vscode-docker", // Docker extension for Visual Studio Code
-                "charliermarsh.ruff" // Ruff extension for Ruff language support
+                "charliermarsh.ruff", // Ruff extension for Ruff language support
+                "github.vscode-github-actions" // GitHub Actions extension for Visual Studio Code
             ]
         }
     },
     // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
     "remoteUser": "devuser",
     "shutdownAction": "stopContainer",
-    "postStartCommand": "./scripts/init-setup.sh"
+    "initializeCommand": "bash ./.devcontainer/git-init.sh",
+    "postStartCommand": "./.devcontainer/init-setup.sh"
 }

.devcontainer/git-init.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+GIT_USER=$(git config --get user.name)
+GIT_EMAIL=$(git config --get user.email)
+
+# Exit if GIT_USER or GIT_EMAIL is empty
+if [ -z "$GIT_USER" ] || [ -z "$GIT_EMAIL" ]; then
+  echo "GIT_USER or GIT_EMAIL is not set. Exiting."
+  exit 1
+fi
+
+git config --local user.name "$GIT_USER"
+git config --local user.email "$GIT_EMAIL"
+
+# This directory should contain custom Git hooks for the repository
+# Set the path for Git hooks to /workspace/hooks
+git config --local core.hooksPath '%(prefix)/workspace/hooks'
+# Set the safe directory to the workspace path
+git config --local --add safe.directory /workspace

.devcontainer/init-setup.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+set -e
+
+# =============================================================================
+# Dev Container Initialization Script (init-setup.sh)
+#
+# This script runs when the Dev Container starts and provides guidance on
+# how to interact with the project. It prints an ASCII logo, displays the
+# current user, changes to the project root, and then shows helpful command
+# instructions.
+#
+# Instructions for future developers:
+#
+# - To start the application, use:
+#     ./gradlew bootRun --no-daemon -Dspring-boot.run.fork=true -Dserver.address=0.0.0.0
+#
+# - To run tests, use:
+#     ./gradlew test
+#
+# - To build the project, use:
+#     ./gradlew build
+#
+# - For running pre-commit hooks (if configured), use:
+#     pre-commit run --all-files
+#
+# Make sure you are in the project root directory after this script executes.
+# =============================================================================
+
+echo "Devcontainer started successfully!"
+
+VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
+GRADLE_VERSION=$(gradle -version | grep "^Gradle " | awk '{print $2}')
+GRADLE_PATH=$(which gradle)
+JAVA_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
+JAVA_PATH=$(which java)
+
+echo """
+ ____ _____ ___ ____  _     ___ _   _  ____       ____  ____  _____
+/ ___|_   _|_ _|  _ \| |   |_ _| \ | |/ ___|     |  _ \|  _ \|  ___|
+\___ \ | |  | || |_) | |    | ||  \| | |  _ _____| |_) | | | | |_
+ ___) || |  | ||  _ <| |___ | || |\  | |_| |_____|  __/| |_| |  _|
+|____/ |_| |___|_| \_\_____|___|_| \_|\____|     |_|   |____/|_|
+"""
+echo -e "Stirling-PDF Version: \e[32m$VERSION\e[0m"
+echo -e "Gradle Version: \e[32m$GRADLE_VERSION\e[0m"
+echo -e "Gradle Path: \e[32m$GRADLE_PATH\e[0m"
+echo -e "Java Version: \e[32m$JAVA_VERSION\e[0m"
+echo -e "Java Path: \e[32m$JAVA_PATH\e[0m"
+
+# Display current active user (for permission/debugging purposes)
+echo -e "Current user: \e[32m$(whoami)\e[0m"
+
+# Change directory to the project root (parent directory of the script)
+cd "$(dirname "$0")/.."
+echo -e "Changed to project root: \e[32m$(pwd)\e[0m"
+
+# Display available commands for developers
+echo "=================================================================="
+echo "Available commands:"
+echo ""
+echo "  To start unoserver: "
+echo -e "\e[34m    nohup /opt/venv/bin/unoserver --port 2003 --interface 0.0.0.0 > /tmp/unoserver.log 2>&1 &\e[0m"
+echo
+echo "  To start the application: "
+echo -e "\e[34m    gradle bootRun\e[0m"
+echo ""
+echo "  To run tests: "
+echo -e "\e[34m    gradle test\e[0m"
+echo ""
+echo "  To build the project: "
+echo -e "\e[34m    gradle build\e[0m"
+echo ""
+echo "  To run pre-commit hooks (if configured):"
+echo -e "\e[34m    pre-commit run --all-files -c .pre-commit-config.yaml\e[0m"
+echo "=================================================================="

.github/labeler-config.yml

@@ -27,18 +27,34 @@ Back End:
 
 Security:
   - changed-files:
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/interfaces/DatabaseInterface.java'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/DatabaseController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/EmailController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/H2SQLController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/DatabaseWebController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/UserController.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/api/Email.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/exception/BackupNotFoundException.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/exception/NoProviderFoundExceptionjava'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/provider/**/*'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/AuthenticationType.java'
-    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/BackupNotFoundException.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/ApiKeyAuthenticationToken.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/AttemptCounter.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/Authority.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/PersistentLogin.java'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/SessionEntity.java'
     - any-glob-to-any-file: 'scripts/download-security-jar.sh'
     - any-glob-to-any-file: '.github/workflows/dependency-review.yml'
     - any-glob-to-any-file: '.github/workflows/scorecards.yml'
 
 API:
   - changed-files:
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
     - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/**/*'
+    - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/api/**/*'
     - any-glob-to-any-file: 'scripts/png_to_webp.py'
     - any-glob-to-any-file: 'split_photos.py'
     - any-glob-to-any-file: '.github/workflows/swagger.yml'
@@ -72,7 +88,8 @@ Devtools:
 Test:
   - changed-files:
     - any-glob-to-any-file: 'cucumber/**/*'
-    - any-glob-to-any-file: 'src/test**/*'
+    - any-glob-to-any-file: 'src/test/**/*'
+    - any-glob-to-any-file: 'src/testing/**/*'
     - any-glob-to-any-file: '.pre-commit-config'
     - any-glob-to-any-file: '.github/workflows/pre_commit.yml'
     - any-glob-to-any-file: '.github/workflows/scorecards.yml'

.github/workflows/PR-Demo-Comment.yml

@@ -1,203 +0,0 @@
-name: PR Deployment via Comment
-
-on:
-  issue_comment:
-    types: [created]
-
-permissions:
-  contents: read
-
-jobs:
-  check-comment:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: read
-      issues: read
-    if: |
-      github.event.issue.pull_request &&
-      (
-      contains(github.event.comment.body, 'prdeploy') ||
-      contains(github.event.comment.body, 'deploypr')
-      )
-      &&
-      (
-        github.event.comment.user.login == 'frooodle' ||
-        github.event.comment.user.login == 'sf298' ||
-        github.event.comment.user.login == 'Ludy87' ||
-        github.event.comment.user.login == 'LaserKaspar' ||
-        github.event.comment.user.login == 'sbplat' ||
-        github.event.comment.user.login == 'reecebrowne' ||
-        github.event.comment.user.login == 'DarioGii' ||
-        github.event.comment.user.login == 'ConnorYoh'
-      )
-    outputs:
-      pr_number: ${{ steps.get-pr.outputs.pr_number }}
-      pr_repository: ${{ steps.get-pr-info.outputs.repository }}
-      pr_ref: ${{ steps.get-pr-info.outputs.ref }}
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Get PR data
-        id: get-pr
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const prNumber = context.payload.issue.number;
-            console.log(`PR Number: ${prNumber}`);
-            core.setOutput('pr_number', prNumber);
-
-      - name: Get PR repository and ref
-        id: get-pr-info
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = context.payload.issue.number;
-
-            const { data: pr } = await github.rest.pulls.get({
-              owner,
-              repo,
-              pull_number: prNumber,
-            });
-
-            // For forks, use the full repository name, for internal PRs use the current repo
-            const repository = pr.head.repo.fork ? pr.head.repo.full_name : `${owner}/${repo}`;
-
-            console.log(`PR Repository: ${repository}`);
-            console.log(`PR Branch: ${pr.head.ref}`);
-
-            core.setOutput('repository', repository);
-            core.setOutput('ref', pr.head.ref);
-
-  deploy-pr:
-    needs: check-comment
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      issues: write
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout PR
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          repository: ${{ needs.check-comment.outputs.pr_repository }}
-          ref: ${{ needs.check-comment.outputs.pr_ref }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up JDK
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - name: Run Gradle Command
-        run: ./gradlew clean build
-        env:
-          DOCKER_ENABLE_SECURITY: false
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-
-      - name: Get version number
-        id: versionNumber
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Build and push PR-specific image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ needs.check-comment.outputs.pr_number }}
-          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-          platforms: linux/amd64
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Deploy to VPS
-        run: |
-          # First create the docker-compose content locally
-          cat > docker-compose.yml << 'EOF'
-          version: '3.3'
-          services:
-            stirling-pdf:
-              container_name: stirling-pdf-pr-${{ needs.check-comment.outputs.pr_number }}
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ needs.check-comment.outputs.pr_number }}
-              ports:
-                - "${{ needs.check-comment.outputs.pr_number }}:8080"
-              volumes:
-                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/data:/usr/share/tessdata:rw
-                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/config:/configs:rw
-                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/logs:/logs:rw
-              environment:
-                DOCKER_ENABLE_SECURITY: "false"
-                SECURITY_ENABLELOGIN: "false"
-                SYSTEM_DEFAULTLOCALE: en-GB
-                UI_APPNAME: "Stirling-PDF PR#${{ needs.check-comment.outputs.pr_number }}"
-                UI_HOMEDESCRIPTION: "PR#${{ needs.check-comment.outputs.pr_number }} for Stirling-PDF Latest"
-                UI_APPNAMENAVBAR: "PR#${{ needs.check-comment.outputs.pr_number }}"
-                SYSTEM_MAXFILESIZE: "100"
-                METRICS_ENABLED: "true"
-                SYSTEM_GOOGLEVISIBILITY: "false"
-              restart: on-failure:5
-          EOF
-
-          # Then copy the file and execute commands
-          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/docker-compose.yml
-
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
-            # Create PR-specific directories
-            mkdir -p /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/{data,config,logs}
-
-            # Move docker-compose file to correct location
-            mv /tmp/docker-compose.yml /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/docker-compose.yml
-
-            # Start or restart the container
-            cd /stirling/PR-${{ needs.check-comment.outputs.pr_number }}
-            docker-compose pull
-            docker-compose up -d
-          ENDSSH
-
-      - name: Post deployment URL to PR
-        if: success()
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { GITHUB_REPOSITORY } = process.env;
-            const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
-            const prNumber = ${{ needs.check-comment.outputs.pr_number }};
-
-            const deploymentUrl = `http://${{ secrets.VPS_HOST }}:${prNumber}`;
-            const commentBody = `## 🚀 PR Test Deployment\n\n` +
-                              `Your PR has been deployed for testing!\n\n` +
-                              `🔗 **Test URL:** [${deploymentUrl}](${deploymentUrl})\n\n` +
-                              `This deployment will be automatically cleaned up when the PR is closed.\n\n`;
-
-            await github.rest.issues.createComment({
-              owner: repoOwner,
-              repo: repoName,
-              issue_number: prNumber,
-              body: commentBody
-            });

.github/workflows/PR-Demo-cleanup.yml

@@ -1,59 +0,0 @@
-name: PR Deployment cleanup
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-
-permissions:
-  contents: read
-
-env:
-  SERVER_IP: ${{ secrets.VPS_IP }} # Add this to your GitHub secrets
-  CLEANUP_PERFORMED: "false" # Add flag to track if cleanup occurred
-
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    if: github.event.action == 'closed'
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Cleanup PR deployment
-        id: cleanup
-        run: |
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
-            if [ -d "/stirling/PR-${{ github.event.pull_request.number }}" ]; then
-              echo "Found PR directory, proceeding with cleanup..."
-
-              # Stop and remove containers
-              cd /stirling/PR-${{ github.event.pull_request.number }}
-              docker-compose down || true
-
-              # Go back to root before removal
-              cd /
-
-              # Remove PR-specific directories
-              rm -rf /stirling/PR-${{ github.event.pull_request.number }}
-
-              # Remove the Docker image
-              docker rmi --no-prune ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ github.event.pull_request.number }} || true
-
-              echo "PERFORMED_CLEANUP"
-            else
-              echo "PR directory not found, nothing to clean up"
-              echo "NO_CLEANUP_NEEDED"
-            fi
-          ENDSSH

.github/workflows/auto-labeler.yml

@@ -1,27 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-
-permissions:
-  contents: read
-
-jobs:
-  labeler:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Apply Labels
-        uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          configuration-path: .github/labeler-config.yml
-          sync-labels: true

.github/workflows/build.yml

@@ -1,144 +0,0 @@
-name: Build repo
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    permissions:
-      actions: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        jdk-version: [17, 21]
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK ${{ matrix.jdk-version }}
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: ${{ matrix.jdk-version }}
-          distribution: "temurin"
-
-      - name: Build with Gradle and no spring security
-        run: ./gradlew clean build
-        env:
-          DOCKER_ENABLE_SECURITY: false
-
-      - name: Build with Gradle and with spring security
-        run: ./gradlew clean build
-        env:
-          DOCKER_ENABLE_SECURITY: true
-
-      - name: Upload Test Reports
-        if: always()
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: test-reports-jdk-${{ matrix.jdk-version }}
-          path: |
-            build/reports/tests/
-            build/test-results/
-            build/reports/problems/
-          retention-days: 3
-
-  check-licence:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: "17"
-          distribution: "adopt"
-
-      - name: check the licenses for compatibility
-        run: ./gradlew clean checkLicense
-
-      - name: FAILED - check the licenses for compatibility
-        if: failure()
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: dependencies-without-allowed-license.json
-          path: |
-            build/reports/dependency-license/dependencies-without-allowed-license.json
-          retention-days: 3
-
-  docker-compose-tests:
-    # if: github.event_name == 'push' && github.ref == 'refs/heads/main' ||
-    #     (github.event_name == 'pull_request' &&
-    #     contains(github.event.pull_request.labels.*.name, 'licenses') == false &&
-    #     (
-    #       contains(github.event.pull_request.labels.*.name, 'Front End') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Java') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Back End') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Security') ||
-    #       contains(github.event.pull_request.labels.*.name, 'API') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Docker') ||
-    #       contains(github.event.pull_request.labels.*.name, 'Test')
-    #     )
-    #     )
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout Repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up Java 17
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: "17"
-          distribution: "adopt"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-
-      - name: Install Docker Compose
-        run: |
-          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-
-      - name: Set up Python
-        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
-        with:
-          python-version: "3.12"
-          cache: 'pip' # caching pip dependencies
-
-      - name: Pip requirements
-        run: |
-          pip install --require-hashes -r ./testing/cucumber/requirements.txt
-
-      - name: Run Docker Compose Tests
-        run: |
-          chmod +x ./testing/test_webpages.sh
-          chmod +x ./testing/test.sh
-          ./testing/test.sh

.github/workflows/check_properties.yml

@@ -1,250 +0,0 @@
-name: Check Properties Files on PR
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-    paths:
-      - "src/main/resources/messages_*.properties"
-
-permissions:
-  contents: read # Allow read access to repository content
-
-jobs:
-  check-files:
-    if: github.event_name == 'pull_request_target'
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write # Allow posting comments on issues/PRs
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout main branch first
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up Python
-        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
-        with:
-          python-version: "3.12"
-
-      - name: Get PR data
-        id: get-pr-data
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const prNumber = context.payload.pull_request.number;
-            const repoOwner = context.payload.repository.owner.login;
-            const repoName = context.payload.repository.name;
-            const branch = context.payload.pull_request.head.ref;
-
-            console.log(`PR Number: ${prNumber}`);
-            console.log(`Repo Owner: ${repoOwner}`);
-            console.log(`Repo Name: ${repoName}`);
-            console.log(`Branch: ${branch}`);
-
-            core.setOutput("pr_number", prNumber);
-            core.setOutput("repo_owner", repoOwner);
-            core.setOutput("repo_name", repoName);
-            core.setOutput("branch", branch);
-        continue-on-error: true
-
-      - name: Fetch PR changed files
-        id: fetch-pr-changes
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          echo "Fetching PR changed files..."
-          echo "Getting list of changed files from PR..."
-          gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$' > changed_files.txt # Filter only matching property files
-
-      - name: Determine reference file test
-        id: determine-file
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const fs = require("fs");
-            const path = require("path");
-
-            const prNumber = ${{ steps.get-pr-data.outputs.pr_number }};
-            const repoOwner = "${{ steps.get-pr-data.outputs.repo_owner }}";
-            const repoName = "${{ steps.get-pr-data.outputs.repo_name }}";
-
-            const prRepoOwner = "${{ github.event.pull_request.head.repo.owner.login }}";
-            const prRepoName = "${{ github.event.pull_request.head.repo.name }}";
-            const branch = "${{ steps.get-pr-data.outputs.branch }}";
-
-            console.log(`Determining reference file for PR #${prNumber}`);
-
-            // Validate inputs
-            const validateInput = (input, regex, name) => {
-              if (!regex.test(input)) {
-                throw new Error(`Invalid ${name}: ${input}`);
-              }
-            };
-
-            validateInput(repoOwner, /^[a-zA-Z0-9_-]+$/, "repository owner");
-            validateInput(repoName, /^[a-zA-Z0-9._-]+$/, "repository name");
-            validateInput(branch, /^[a-zA-Z0-9._/-]+$/, "branch name");
-
-            // Get the list of changed files in the PR
-            const { data: files } = await github.rest.pulls.listFiles({
-              owner: repoOwner,
-              repo: repoName,
-              pull_number: prNumber,
-            });
-
-            // Filter for relevant files based on the PR changes
-            const changedFiles = files
-              .map(file => file.filename)
-              .filter(file => /^src\/main\/resources\/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$/.test(file));
-
-            console.log("Changed files:", changedFiles);
-
-            // Create a temporary directory for PR files
-            const tempDir = "pr-branch";
-            if (!fs.existsSync(tempDir)) {
-              fs.mkdirSync(tempDir, { recursive: true });
-            }
-
-            // Download and save each changed file
-            for (const file of changedFiles) {
-              const { data: fileContent } = await github.rest.repos.getContent({
-                owner: prRepoOwner,
-                repo: prRepoName,
-                path: file,
-                ref: branch,
-              });
-
-              const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
-              const filePath = path.join(tempDir, file);
-              const dirPath = path.dirname(filePath);
-
-              if (!fs.existsSync(dirPath)) {
-                fs.mkdirSync(dirPath, { recursive: true });
-              }
-
-              fs.writeFileSync(filePath, content);
-              console.log(`Saved file: ${filePath}`);
-            }
-
-            // Output the list of changed files for further processing
-            const fileList = changedFiles.join(" ");
-            core.exportVariable("FILES_LIST", fileList);
-            console.log("Files saved and listed in FILES_LIST.");
-
-            // Determine reference file
-            let referenceFilePath;
-            if (changedFiles.includes("src/main/resources/messages_en_GB.properties")) {
-              console.log("Using PR branch reference file.");
-              const { data: fileContent } = await github.rest.repos.getContent({
-                owner: prRepoOwner,
-                repo: prRepoName,
-                path: "src/main/resources/messages_en_GB.properties",
-                ref: branch,
-              });
-
-              referenceFilePath = "pr-branch-messages_en_GB.properties";
-              const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
-              fs.writeFileSync(referenceFilePath, content);
-            } else {
-              console.log("Using main branch reference file.");
-              const { data: fileContent } = await github.rest.repos.getContent({
-                owner: repoOwner,
-                repo: repoName,
-                path: "src/main/resources/messages_en_GB.properties",
-                ref: "main",
-              });
-
-              referenceFilePath = "main-branch-messages_en_GB.properties";
-              const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
-              fs.writeFileSync(referenceFilePath, content);
-            }
-
-            console.log(`Reference file path: ${referenceFilePath}`);
-            core.exportVariable("REFERENCE_FILE", referenceFilePath);
-
-      - name: Run Python script to check files
-        id: run-check
-        run: |
-          echo "Running Python script to check files..."
-          python .github/scripts/check_language_properties.py \
-            --actor ${{ github.event.pull_request.user.login }} \
-            --reference-file "${REFERENCE_FILE}" \
-            --branch "pr-branch" \
-            --files "${FILES_LIST[@]}" > result.txt
-        continue-on-error: true # Continue the job even if this step fails
-
-      - name: Capture output
-        id: capture-output
-        run: |
-          if [ -f result.txt ] && [ -s result.txt ]; then
-            echo "Test, capturing output..."
-            SCRIPT_OUTPUT=$(cat result.txt)
-            echo "SCRIPT_OUTPUT<<EOF" >> $GITHUB_ENV
-            echo "$SCRIPT_OUTPUT" >> $GITHUB_ENV
-            echo "EOF" >> $GITHUB_ENV
-            echo "${SCRIPT_OUTPUT}"
-
-            # Determine job failure based on script output
-            if [[ "$SCRIPT_OUTPUT" == *"❌"* ]]; then
-              echo "FAIL_JOB=true" >> $GITHUB_ENV
-            else
-              echo "FAIL_JOB=false" >> $GITHUB_ENV
-            fi
-          else
-            echo "No update found."
-            echo "SCRIPT_OUTPUT=" >> $GITHUB_ENV
-            echo "FAIL_JOB=false" >> $GITHUB_ENV
-          fi
-
-      - name: Post comment on PR
-        if: env.SCRIPT_OUTPUT != ''
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { GITHUB_REPOSITORY, SCRIPT_OUTPUT } = process.env;
-            const [repoOwner, repoName] = GITHUB_REPOSITORY.split('/');
-            const issueNumber = context.issue.number;
-
-            // Find existing comment
-            const comments = await github.rest.issues.listComments({
-              owner: repoOwner,
-              repo: repoName,
-              issue_number: issueNumber
-            });
-
-            const comment = comments.data.find(c => c.body.includes("## 🚀 Translation Verification Summary"));
-
-            // Only update or create comments by the action user
-            const expectedActor = "github-actions[bot]";
-
-            if (comment && comment.user.login === expectedActor) {
-              // Update existing comment
-              await github.rest.issues.updateComment({
-                owner: repoOwner,
-                repo: repoName,
-                comment_id: comment.id,
-                body: `## 🚀 Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
-              });
-              console.log("Updated existing comment.");
-            } else if (!comment) {
-              // Create new comment if no existing comment is found
-              await github.rest.issues.createComment({
-                owner: repoOwner,
-                repo: repoName,
-                issue_number: issueNumber,
-                body: `## 🚀 Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
-              });
-              console.log("Created new comment.");
-            } else {
-              console.log("Comment update attempt denied. Actor does not match.");
-            }
-
-      - name: Fail job if errors found
-        if: env.FAIL_JOB == 'true'
-        run: |
-          echo "Failing the job because errors were detected."
-          exit 1

.github/workflows/codeql.yml-disabled

@@ -1,79 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-#disable for now
-#on:
-#  push:
-#    branches: ["main"]
-#  pull_request:
-    # The branches below must be a subset of the branches above
-#    branches: ["main"]
-#  schedule:
-#    - cron: "0 0 * * 1"
-
-permissions:
-  contents: read
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ["java"]
-        # CodeQL supports [ $supported-codeql-languages ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-      #   If the Autobuild fails above, remove it and uncomment the following three lines.
-      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-      # - run: |
-      #   echo "Run, Build Application using script"
-      #   ./location_of_script_within_repo/buildscript.sh
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-        with:
-          category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

@@ -1,27 +0,0 @@
-# Dependency Review Action
-#
-# This Action will scan dependency manifest files that change as part of a Pull Request,
-# surfacing known-vulnerable versions of the packages declared or updated in the PR.
-# Once installed, if the workflow run is marked as required,
-# PRs introducing known-vulnerable packages will be blocked from merging.
-#
-# Source repository: https://github.com/actions/dependency-review-action
-name: "Dependency Review"
-on: [pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: "Checkout Repository"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: "Dependency Review"
-        uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0

.github/workflows/licenses-update.yml

@@ -1,92 +0,0 @@
-name: License Report Workflow
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "build.gradle"
-
-permissions:
-  contents: read
-
-jobs:
-  generate-license-report:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Generate GitHub App Token
-        id: generate-token
-        uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: "17"
-          distribution: "adopt"
-
-      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
-
-      - name: check the licenses for compatibility
-        run: ./gradlew clean checkLicense
-
-      - name: FAILED - check the licenses for compatibility
-        if: failure()
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: dependencies-without-allowed-license.json
-          path: |
-            build/reports/dependency-license/dependencies-without-allowed-license.json
-          retention-days: 3
-
-      - name: Move and Rename License File
-        run: |
-          mv build/reports/dependency-license/index.json src/main/resources/static/3rdPartyLicenses.json
-
-      - name: Set up git config
-        run: |
-          git config --global user.name "stirlingbot[bot]"
-          git config --global user.email "1113334+stirlingbot[bot]@users.noreply.github.com"
-
-      - name: Run git add
-        run: |
-          git add src/main/resources/static/3rdPartyLicenses.json
-          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-
-      - name: Create Pull Request
-        id: cpr
-        if: env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          commit-message: "Update 3rd Party Licenses"
-          committer: "stirlingbot[bot] <1113334+stirlingbot[bot]@users.noreply.github.com>"
-          author: "stirlingbot[bot] <1113334+stirlingbot[bot]@users.noreply.github.com>"
-          signoff: true
-          branch: update-3rd-party-licenses
-          title: "Update 3rd Party Licenses"
-          body: |
-            Auto-generated by StirlingBot
-          labels: licenses,github-actions
-          draft: false
-          delete-branch: true
-          sign-commits: true
-
-      - name: Enable Pull Request Automerge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
-        env:
-          GH_TOKEN: ${{ steps.generate-token.outputs.token }}

.github/workflows/manage-label.yml

@@ -1,30 +0,0 @@
-name: Manage labels
-
-on:
-  schedule:
-    - cron: "30 20 * * *"
-
-permissions:
-  contents: read
-
-jobs:
-  labeler:
-    name: Labeler
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@31674a3852a9074f2086abcf1c53839d466a47e7 # v5.2.0
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          yaml-file: .github/labels.yml
-          skip-delete: true

.github/workflows/multiOSReleases.yml

@@ -1,288 +0,0 @@
-name: Test Installers Build
-
-on:
-  workflow_dispatch:
-  release:
-    types: [created]
-
-permissions:
-  contents: read
-
-jobs:
-  read_versions:
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.versionNumber.outputs.versionNumber }}
-      versionMac: ${{ steps.versionNumberMac.outputs.versionNumberMac }}
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      # Get version number
-      - name: Get version number
-        id: versionNumber
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Get version number mac
-        id: versionNumberMac
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          CURRENT_YEAR=$(date +'%Y')
-          IFS='.' read -r -a VERSION_PARTS <<< "$VERSION"
-          MAC_VERSION="$CURRENT_YEAR.${VERSION_PARTS[1]:-0}.${VERSION_PARTS[2]:-0}"
-          echo "versionNumberMac=$MAC_VERSION" >> $GITHUB_OUTPUT
-
-  build-portable:
-    needs: read_versions
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        enable_security: [true, false]
-        include:
-          - enable_security: true
-            file_suffix: "-with-login"
-          - enable_security: false
-            file_suffix: ""
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: "21"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
-        with:
-          gradle-version: 8.12
-
-      - name: Generate jar (With Security=${{ matrix.enable_security }})
-        run: ./gradlew clean createExe
-        env:
-          DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Rename binaries
-        run: |
-          mkdir ./binaries
-          mv ./build/launch4j/Stirling-PDF.exe ./binaries/win-Stirling-PDF-portable-Server${{ matrix.file_suffix }}.exe
-          mv ./build/libs/Stirling-PDF-${{ needs.read_versions.outputs.version }}.jar ./binaries/Stirling-PDF${{ matrix.file_suffix }}.jar
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          retention-days: 1
-          if-no-files-found: error
-          name: stirling${{ matrix.file_suffix }}-binaries
-          path: |
-            ./binaries/*
-
-  sign_verify-portable:
-    needs: [build-portable, read_versions]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        enable_security: [true, false]
-        include:
-          - enable_security: true
-            file_suffix: "with-login-"
-          - enable_security: false
-            file_suffix: ""
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
-        with:
-          name: stirling-${{ matrix.file_suffix }}binaries
-
-      - name: Display structure of downloaded files
-        run: ls -R
-
-      - name: Upload signed artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          retention-days: 1
-          if-no-files-found: error
-          name: stirling-${{ matrix.file_suffix }}signed
-          path: |
-            ./*
-            !cosign.*
-
-  build-installers:
-    needs: read_versions
-    strategy:
-      matrix:
-        include:
-          - os: windows-latest
-            platform: win-
-          - os: macos-latest
-            platform: mac-
-          # - os: ubuntu-latest
-          #   platform: linux-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: "21"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
-        with:
-          gradle-version: 8.12
-
-      # Install Windows dependencies
-      - name: Install WiX Toolset
-        if: matrix.os == 'windows-latest'
-        run: |
-          curl -L -o wix.exe https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe
-          .\wix.exe /install /quiet
-
-      # Build installer
-      - name: Build Installer
-        run: ./gradlew build jpackage -x test --info
-        env:
-          DOCKER_ENABLE_SECURITY: false
-          STIRLING_PDF_DESKTOP_UI: true
-          BROWSER_OPEN: true
-
-      # Rename and collect artifacts based on OS
-      - name: Prepare artifacts
-        id: prepare
-        shell: bash
-        run: |
-          mkdir ./binaries
-          if [ "${{ matrix.os }}" = "windows-latest" ]; then
-            mv "./build/jpackage/Stirling-PDF-${{ needs.read_versions.outputs.version }}.exe" "./binaries/Stirling-PDF-win-installer.exe"
-          elif [ "${{ matrix.os }}" = "macos-latest" ]; then
-            mv "./build/jpackage/Stirling-PDF-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-installer.dmg"
-          else
-            mv "./build/jpackage/stirling-pdf_${{ needs.read_versions.outputs.version }}-1_amd64.deb" "./binaries/Stirling-PDF-linux-installer.deb"
-          fi
-
-      - name: Display structure of downloaded files
-        run: ls -R ./binaries
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          retention-days: 1
-          if-no-files-found: error
-          name: ${{ matrix.platform }}binaries
-          path: |
-            ./binaries/*
-
-  sign_verify:
-    needs: [read_versions, build-installers]
-    strategy:
-      matrix:
-        include:
-          - os: windows-latest
-            platform: win-
-          - os: macos-latest
-            platform: mac-
-          # - os: ubuntu-latest
-          #   platform: linux-
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
-        with:
-          name: ${{ matrix.platform }}binaries
-
-      - name: Display structure of downloaded files
-        run: ls -R
-
-      - name: Install Cosign
-        if: matrix.os == 'windows-latest'
-        uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
-
-      - name: Generate key pair
-        if: matrix.os == 'windows-latest'
-        run: cosign generate-key-pair
-
-      - name: Sign and generate attestations
-        if: matrix.os == 'windows-latest'
-        run: |
-          cosign sign-blob \
-            --key ./cosign.key \
-            --yes \
-            --output-signature ./Stirling-PDF-win-installer.exe.sig \
-            ./Stirling-PDF-win-installer.exe
-
-          cosign attest-blob \
-            --predicate - \
-            --key ./cosign.key \
-            --yes \
-            --output-attestation ./Stirling-PDF-win-installer.exe.intoto.jsonl \
-            ./Stirling-PDF-win-installer.exe
-
-          cosign verify-blob \
-            --key ./cosign.pub \
-            --signature ./Stirling-PDF-win-installer.exe.sig \
-            ./Stirling-PDF-win-installer.exe
-
-      - name: Display structure of downloaded files
-        run: ls -R
-
-      - name: Upload signed artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          retention-days: 1
-          if-no-files-found: error
-          name: ${{ matrix.platform }}signed
-          path: |
-            ./Stirling-PDF-${{ matrix.platform }}installer.*
-            !cosign.*
-
-  create-release:
-    needs: [read_versions, sign_verify, sign_verify-portable]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Download signed artifacts
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
-      - name: Display structure of downloaded files
-        run: ls -R
-      - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
-        with:
-          tag_name: v${{ needs.read_versions.outputs.version }}
-          generate_release_notes: true
-          files: |
-            ./*signed/*

.github/workflows/pre_commit.yml

@@ -1,80 +0,0 @@
-name: Pre-commit
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * 1"
-
-permissions:
-  contents: read
-
-jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Generate GitHub App Token
-        id: generate-token
-        uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Get GitHub App User ID
-        id: get-user-id
-        run: echo "user-id=$(gh api "/users/${{ steps.generate-token.outputs.app-slug }}[bot]" --jq .id)" >> $GITHUB_OUTPUT
-        env:
-          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
-
-      - id: committer
-        run: |
-          echo "string=${{ steps.generate-token.outputs.app-slug }}[bot] <${{ steps.get-user-id.outputs.user-id }}+${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com>"  >> "$GITHUB_OUTPUT"
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-      - name: Set up Python
-        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
-        with:
-          python-version: 3.12
-          cache: 'pip' # caching pip dependencies
-      - name: Run Pre-Commit Hooks
-        run: |
-          pip install --require-hashes -r ./.github/scripts/requirements_pre_commit.txt
-      - run: pre-commit run --all-files -c .pre-commit-config.yaml
-        continue-on-error: true
-      - name: Set up git config
-        run: |
-          git config --global user.name ${{ steps.generate-token.outputs.app-slug }}[bot]
-          git config --global user.email "${{ steps.get-user-id.outputs.user-id }}+${{ steps.generate-token.outputs.app-slug }}[bot]@users.noreply.github.com"
-      - name: git add
-        run: |
-          git add .
-          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
-      - name: Create Pull Request
-        if: env.CHANGES_DETECTED == 'true'
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          commit-message: ":file_folder: pre-commit"
-          committer: ${{ steps.committer.outputs.string }}
-          author: ${{ steps.committer.outputs.string }}
-          signoff: true
-          branch: pre-commit
-          title: "🤖 format everything with pre-commit by <${{ steps.generate-token.outputs.app-slug }}>"
-          body: |
-            Auto-generated by [create-pull-request][1] with **${{ steps.generate-token.outputs.app-slug }}**
-
-            [1]: https://github.com/peter-evans/create-pull-request
-          draft: false
-          delete-branch: true
-          labels: github-actions
-          sign-commits: true

.github/workflows/push-docker.yml

@@ -1,195 +0,0 @@
-name: Push Docker Image with VersionNumber
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-      - main
-
-permissions:
-  contents: read
-
-jobs:
-  push:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      id-token: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
-        with:
-          gradle-version: 8.12
-
-      - name: Run Gradle Command
-        run: ./gradlew clean build
-        env:
-          DOCKER_ENABLE_SECURITY: false
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Install cosign
-        if: github.ref == 'refs/heads/master'
-        uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
-        with:
-          cosign-release: "v2.4.1"
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-
-      - name: Get version number
-        id: versionNumber
-        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
-
-      - name: Convert repository owner to lowercase
-        id: repoowner
-        run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" >> $GITHUB_OUTPUT
-
-      - name: Generate tags
-        id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
-        with:
-          images: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
-            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
-          tags: |
-            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
-
-      - name: Build and push main Dockerfile
-        id: build-push-regular
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./Dockerfile
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-          platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Sign regular images
-        if: github.ref == 'refs/heads/master'
-        env:
-          DIGEST: ${{ steps.build-push-regular.outputs.digest }}
-          TAGS: ${{ steps.meta.outputs.tags }}
-          COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
-          COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
-        run: |
-          echo "$TAGS" | tr ',' '\n' | while read -r tag; do
-            cosign sign --yes \
-              --key env://COSIGN_PRIVATE_KEY \
-              "${tag}@${DIGEST}"
-          done
-
-      - name: Generate tags ultra-lite
-        id: meta2
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
-        if: github.ref != 'refs/heads/main'
-        with:
-          images: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
-            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
-          tags: |
-            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
-
-      - name: Build and push Dockerfile-ultra-lite
-        id: build-push-lite
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
-        if: github.ref != 'refs/heads/main'
-        with:
-          context: .
-          file: ./Dockerfile.ultra-lite
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ steps.meta2.outputs.tags }}
-          labels: ${{ steps.meta2.outputs.labels }}
-          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-          platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Generate tags fat
-        id: meta3
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
-        if: github.ref != 'refs/heads/main'
-        with:
-          images: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
-            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
-          tags: |
-            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-fat,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
-
-      - name: Build and push main Dockerfile fat
-        id: build-push-fat
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
-        if: github.ref != 'refs/heads/main'
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./Dockerfile.fat
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ steps.meta3.outputs.tags }}
-          labels: ${{ steps.meta3.outputs.labels }}
-          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-          platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Sign fat images
-        if: github.ref == 'refs/heads/master'
-        env:
-          DIGEST: ${{ steps.build-push-fat.outputs.digest }}
-          TAGS: ${{ steps.meta3.outputs.tags }}
-          COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
-          COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
-        run: |
-          echo "$TAGS" | tr ',' '\n' | while read -r tag; do
-            cosign sign --key env://COSIGN_PRIVATE_KEY --yes "${tag}@${DIGEST}"
-          done

.github/workflows/releaseArtifacts.yml

@@ -1,180 +0,0 @@
-name: Release Artifacts
-
-on:
-  workflow_dispatch:
-  release:
-    types: [created]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        enable_security: [true, false]
-        include:
-          - enable_security: true
-            file_suffix: "-with-login"
-          - enable_security: false
-            file_suffix: ""
-    outputs:
-      version: ${{ steps.versionNumber.outputs.versionNumber }}
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
-        with:
-          gradle-version: 8.12
-
-      - name: Generate jar (With Security=${{ matrix.enable_security }})
-        run: ./gradlew clean createExe
-        env:
-          DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
-          STIRLING_PDF_DESKTOP_UI: false
-
-      - name: Get version number
-        id: versionNumber
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Rename binaries
-        run: |
-          mv ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
-          mv ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
-
-      - name: Debug build artifacts
-        run: |
-          echo "Current Directory: $(pwd)"
-          ls -R ./build/libs
-          ls -R ./build/launch4j
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: binaries${{ matrix.file_suffix }}
-          path: |
-            ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.*
-            ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.*
-
-  sign_verify:
-    needs: build
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        enable_security: [true, false]
-        include:
-          - enable_security: true
-            file_suffix: "-with-login"
-          - enable_security: false
-            file_suffix: ""
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
-        with:
-          name: binaries${{ matrix.file_suffix }}
-      - name: Display structure of downloaded files
-        run: ls -R
-
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
-
-      - name: Generate key pair
-        run: cosign generate-key-pair
-
-      - name: Sign and generate attestations
-        run: |
-          cosign sign-blob \
-            --key ./cosign.key \
-            --yes \
-            --output-signature ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar.sig \
-            ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar
-
-          cosign attest-blob \
-            --predicate - \
-            --key ./cosign.key \
-            --yes \
-            --output-attestation ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar.intoto.jsonl \
-            ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar
-
-          cosign verify-blob \
-            --key ./cosign.pub \
-            --signature ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar.sig \
-            ./libs/Stirling-PDF${{ matrix.file_suffix }}.jar
-
-          cosign sign-blob \
-            --key ./cosign.key \
-            --yes \
-            --output-signature ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe.sig \
-            ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
-
-          cosign attest-blob \
-            --predicate - \
-            --key ./cosign.key \
-            --yes \
-            --output-attestation ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe.intoto.jsonl \
-            ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
-
-          cosign verify-blob \
-            --key ./cosign.pub \
-            --signature ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe.sig \
-            ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
-
-      - name: Upload signed artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: signed${{ matrix.file_suffix }}
-          path: |
-            ./libs/Stirling-PDF${{ matrix.file_suffix }}.*
-            ./launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.*
-
-  release:
-    needs: [build, sign_verify]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    strategy:
-      matrix:
-        enable_security: [true, false]
-        include:
-          - enable_security: true
-            file_suffix: "-with-login"
-          - enable_security: false
-            file_suffix: ""
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Download signed artifacts
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
-        with:
-          name: signed${{ matrix.file_suffix }}
-
-      - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
-        with:
-          tag_name: v${{ needs.build.outputs.version }}
-          generate_release_notes: true
-          files: |
-            ./libs/Stirling-PDF*
-            ./launch4j/Stirling-PDF-Server*

.github/workflows/scorecards.yml

@@ -1,79 +0,0 @@
-# This workflow uses actions that are not certified by GitHub. They are provided
-# by a third-party and are governed by separate terms of service, privacy
-# policy, and support documentation.
-
-name: Scorecard supply-chain security
-on:
-  # For Branch-Protection check. Only the default branch is supported. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
-  branch_protection_rule:
-  # To guarantee Maintained check is occasionally updated. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
-  schedule:
-    - cron: "20 7 * * 2"
-  push:
-    branches: ["main"]
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecard analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      # Needed to publish results and get a badge (see publish_results below).
-      id-token: write
-      contents: read
-      actions: read
-      # To allow GraphQL ListCommits to work
-      issues: read
-      pull-requests: read
-      # To detect SAST tools
-      checks: read
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
-          # - you want to enable the Branch-Protection check on a *public* repository, or
-          # - you are installing Scorecards on a *private* repository
-          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
-          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
-
-          # Public repositories:
-          #   - Publish results to OpenSSF REST API for easy access by consumers
-          #   - Allows the repository to include the Scorecard badge.
-          #   - See https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories:
-          #   - `publish_results` will always be set to `false`, regardless
-          #     of the value entered here.
-          publish_results: true
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
-        with:
-          sarif_file: results.sarif

.github/workflows/sonarqube.yml

@@ -1,63 +0,0 @@
-name: Run Sonarqube
-
-on:
-  push:
-    branches:
-      - master
-  pull_request_target:
-    branches:
-      - main
-  workflow_dispatch:
-
-permissions:
-  pull-requests: read
-  actions: read
-
-jobs:
-  sonarqube:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
-
-      - name: Build and analyze with Gradle
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          DOCKER_ENABLE_SECURITY: true
-          STIRLING_PDF_DESKTOP_UI: true
-        run: |
-          ./gradlew clean build sonar \
-            -Dsonar.projectKey=Stirling-Tools_Stirling-PDF \
-            -Dsonar.organization=stirling-tools \
-            -Dsonar.host.url=https://sonarcloud.io \
-            -Dsonar.login=${SONAR_TOKEN} \
-            -Dsonar.log.level=DEBUG \
-            --info
-
-      - name: Upload Problems Report on Failure
-        if: failure()
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: gradle-problems-report
-          path: build/reports/problems/problems-report.html
-          retention-days: 7
-
-      - name: Upload Sonar Logs on Failure
-        if: failure()
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: sonar-logs
-          path: |
-            .scannerwork/report-task.txt
-            build/sonar/
-          retention-days: 7

.github/workflows/stale.yml

@@ -1,40 +0,0 @@
-name: Close stale issues
-
-on:
-  schedule:
-    - cron: "30 0 * * *"
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: 30 days stale issues
-        uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: 30
-          days-before-close: 7
-          stale-issue-message: >
-            This issue has been automatically marked as stale because it has had no recent activity.
-            It will be closed if no further activity occurs. Thank you for your contributions.
-          close-issue-message: >
-            This issue has been automatically closed because it has had no recent activity after being marked as stale.
-            Please reopen if you need further assistance.
-          stale-issue-label: "Stale"
-          remove-stale-when-updated: true
-          only-issue-labels: "more-info-needed"
-          days-before-pr-stale: -1 # Prevents PRs from being marked as stale
-          days-before-pr-close: -1 # Prevents PRs from being closed
-          start-date: "2024-07-06T00:00:00Z" # ISO 8601 Format

.github/workflows/swagger.yml

@@ -1,47 +0,0 @@
-name: Update Swagger
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-
-permissions:
-  contents: read
-
-jobs:
-  push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
-
-      - name: Generate Swagger documentation
-        run: ./gradlew generateOpenApiDocs
-
-      - name: Upload Swagger Documentation to SwaggerHub
-        run: ./gradlew swaggerhubUpload
-        env:
-          SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
-
-      - name: Get version number
-        id: versionNumber
-        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-
-      - name: Set API version as published and default on SwaggerHub
-        run: |
-          curl -X PUT -H "Authorization: ${SWAGGERHUB_API_KEY}" "https://api.swaggerhub.com/apis/Frooodle/Stirling-PDF/${{ steps.versionNumber.outputs.versionNumber }}/settings/lifecycle" -H  "accept: application/json" -H  "Content-Type: application/json" -d "{\"published\":true,\"default\":true}"
-        env:
-          SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}

.github/workflows/sync_files.yml

@@ -1,145 +0,0 @@
-name: Sync Files
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - "build.gradle"
-      - "README.md"
-      - "src/main/resources/messages_*.properties"
-      - "src/main/resources/static/3rdPartyLicenses.json"
-      - "scripts/ignore_translation.toml"
-
-permissions:
-  contents: read
-
-jobs:
-  read_bot_entries:
-    runs-on: ubuntu-latest
-    outputs:
-      userName: ${{ steps.get-user-id.outputs.user_name }}
-      userEmail: ${{ steps.get-user-id.outputs.user_email }}
-      committer: ${{ steps.committer.outputs.committer }}
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Generate GitHub App Token
-        id: generate-token
-        uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Get GitHub App User ID
-        id: get-user-id
-        run: |
-          USER_NAME="${{ steps.generate-token.outputs.app-slug }}[bot]"
-          USER_ID=$(gh api "/users/$USER_NAME" --jq .id)
-          USER_EMAIL="$USER_ID+$USER_NAME@users.noreply.github.com"
-          echo "user_name=$USER_NAME" >> "$GITHUB_OUTPUT"
-          echo "user_email=$USER_EMAIL" >> "$GITHUB_OUTPUT"
-          echo "user-id=$USER_ID" >> "$GITHUB_OUTPUT"
-        env:
-          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
-
-      - id: committer
-        run: |
-          COMMITTER="${{ steps.get-user-id.outputs.user_name }} <${{ steps.get-user-id.outputs.user_email }}>"
-          echo "committer=$COMMITTER" >> "$GITHUB_OUTPUT"
-
-  sync-files:
-    needs: ["read_bot_entries"]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Generate GitHub App Token
-        id: generate-token
-        uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
-        with:
-          app-id: ${{ vars.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up Python
-        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
-        with:
-          python-version: "3.12"
-          cache: 'pip' # caching pip dependencies
-
-      - name: Sync translation property files
-        run: |
-          python .github/scripts/check_language_properties.py --reference-file "src/main/resources/messages_en_GB.properties" --branch main
-
-      - name: Set up git config
-        run: |
-          git config --global user.name ${{ needs.read_bot_entries.outputs.userName }}
-          git config --global user.email ${{ needs.read_bot_entries.outputs.userEmail }}
-
-      - name: Run git add
-        run: |
-          git add src/main/resources/messages_*.properties
-          git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "no changes"
-
-      - name: Install dependencies
-        run: pip install --require-hashes -r ./.github/scripts/requirements_sync_readme.txt
-
-      - name: Sync README.md
-        run: |
-          python scripts/counter_translation.py
-
-      - name: Run git add
-        run: |
-          git add README.md
-          git diff --staged --quiet || git commit -m ":memo: Sync README.md" || echo "no changes"
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          commit-message: Update files
-          committer: ${{ needs.read_bot_entries.outputs.committer }}
-          author: ${{ needs.read_bot_entries.outputs.committer }}
-          signoff: true
-          branch: sync_readme
-          title: ":globe_with_meridians: Sync Translations + Update README Progress Table"
-          body: |
-            ### Description of Changes
-
-            This Pull Request was automatically generated to synchronize updates to translation files and documentation. Below are the details of the changes made:
-
-            #### **1. Synchronization of Translation Files**
-            - Updated translation files (`messages_*.properties`) to reflect changes in the reference file `messages_en_GB.properties`.
-            - Ensured consistency and synchronization across all supported language files.
-            - Highlighted any missing or incomplete translations.
-
-            #### **2. Update README.md**
-            - Generated the translation progress table in `README.md`.
-            - Added a summary of the current translation status for all supported languages.
-            - Included up-to-date statistics on translation coverage.
-
-            #### **Why these changes are necessary**
-            - Keeps translation files aligned with the latest reference updates.
-            - Ensures the documentation reflects the current translation progress.
-
-            ---
-
-            Auto-generated by [create-pull-request][1].
-
-            [1]: https://github.com/peter-evans/create-pull-request
-          draft: false
-          delete-branch: true
-          labels: github-actions
-          sign-commits: true
-          add-paths: |
-            README.md
-            src/main/resources/messages_*.properties

.github/workflows/testdriver.yml

@@ -1,154 +0,0 @@
-name: UI test with TestDriverAI
-
-on:
-  push:
-    branches: ["master", "UITest", "testdriver"]
-
-permissions:
-  contents: read
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up JDK
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Build with Gradle
-        run: ./gradlew clean build
-        env:
-          DOCKER_ENABLE_SECURITY: false
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-
-      - name: Get version number
-        id: versionNumber
-        run: |
-          VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
-          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Build and push test image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:test-${{ github.sha }}
-          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-          platforms: linux/amd64
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Deploy to VPS
-        run: |
-          cat > docker-compose.yml << EOF
-          version: '3.3'
-          services:
-            stirling-pdf:
-              container_name: stirling-pdf-test-${{ github.sha }}
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:test-${{ github.sha }}
-              ports:
-                - "1337:8080"
-              volumes:
-                - /stirling/test-${{ github.sha }}/data:/usr/share/tessdata:rw
-                - /stirling/test-${{ github.sha }}/config:/configs:rw
-                - /stirling/test-${{ github.sha }}/logs:/logs:rw
-              environment:
-                DOCKER_ENABLE_SECURITY: "false"
-                SECURITY_ENABLELOGIN: "false"
-                SYSTEM_DEFAULTLOCALE: en-GB
-                UI_APPNAME: "Stirling-PDF Test"
-                UI_HOMEDESCRIPTION: "Test Deployment"
-                UI_APPNAMENAVBAR: "Test"
-                SYSTEM_MAXFILESIZE: "100"
-                METRICS_ENABLED: "true"
-                SYSTEM_GOOGLEVISIBILITY: "false"
-                SYSTEM_ENABLEANALYTICS: "false"
-              restart: on-failure:5
-          EOF
-
-          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/docker-compose.yml
-
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << EOF
-            mkdir -p /stirling/test-${{ github.sha }}/{data,config,logs}
-            mv /tmp/docker-compose.yml /stirling/test-${{ github.sha }}/docker-compose.yml
-            cd /stirling/test-${{ github.sha }}
-            docker-compose pull
-            docker-compose up -d
-          EOF
-
-  test:
-    needs: deploy
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Run TestDriver.ai
-        uses: testdriverai/action@f0d0f45fdd684db628baa843fe9313f3ca3a8aa8 #1.1.3
-        with:
-          key: ${{secrets.TESTDRIVER_API_KEY}}
-          prerun: |
-            npm install
-            npm run build
-            npm install dashcam-chrome --save
-            Start-Process "C:/Program Files/Google/Chrome/Application/chrome.exe" -ArgumentList "--start-maximized", "--load-extension=$(pwd)/node_modules/dashcam-chrome/build", "http://${{ secrets.VPS_HOST }}:1337"
-            Start-Sleep -Seconds 20
-          prompt: |
-            1. /run testing/testdriver/test.yml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FORCE_COLOR: "3"
-
-  cleanup:
-    needs: [deploy, test]
-    runs-on: ubuntu-latest
-    if: always()
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
-          sudo chmod 600 ../private.key
-
-      - name: Cleanup deployment
-        run: |
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << EOF
-            cd /stirling/test-${{ github.sha }}
-            docker-compose down
-            cd /stirling
-            rm -rf test-${{ github.sha }}
-          EOF

.gitignore

@@ -27,6 +27,8 @@ clientWebUI/
 !cucumber/exampleFiles/example_html.zip
 exampleYmlFiles/stirling/
 /testing/file_snapshots
+SwaggerDoc.json
+
 # Gradle
 .gradle
 .lock
@@ -188,3 +190,7 @@ id_ed25519.pub
 .ipynb_checkpoints
 
 **/jcef-bundle/
+
+# node_modules
+node_modules/
+*.mjs

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.10
+    rev: v0.11.6
     hooks:
       - id: ruff
         args:
@@ -22,7 +22,7 @@ repos:
         files: \.(html|css|js|py|md)$
         exclude: (.vscode|.devcontainer|src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.24.0
+    rev: v8.24.3
     hooks:
       - id: gitleaks
   - repo: https://github.com/pre-commit/pre-commit-hooks

.vscode/extensions.json

@@ -6,7 +6,7 @@
     "ms-python.flake8", // Flake8 linter for Python to enforce code quality
     "ms-python.python", // Official Microsoft Python extension with IntelliSense, debugging, and Jupyter support
     "ms-vscode-remote.vscode-remote-extensionpack", // Remote Development Pack for SSH, WSL, and Containers
-    "Oracle.oracle-java", // Oracle Java extension with additional features for Java development
+    // "Oracle.oracle-java", // Oracle Java extension with additional features for Java development
     "streetsidesoftware.code-spell-checker", // Spell checker for code to avoid typos
     "vmware.vscode-boot-dev-pack", // Developer tools for Spring Boot by VMware
     "vscjava.vscode-java-pack", // Java Extension Pack with essential Java tools for VS Code

.vscode/settings.json

@@ -10,7 +10,7 @@
   "java.configuration.updateBuildConfiguration": "interactive",
   "java.format.enabled": true,
   "java.format.settings.profile": "GoogleStyle",
-  "java.format.settings.google.version": "1.25.2",
+  "java.format.settings.google.version": "1.26.0",
   "java.format.settings.google.extra": "--aosp --skip-sorting-imports --skip-javadoc-formatting",
   // (DE) Aktiviert Kommentare im Java-Format.
   // (EN) Enables comments in Java formatting.

AGENTS.md

@@ -0,0 +1,24 @@
+# Codex Contribution Guidelines for Stirling-PDF
+
+This file provides high-level instructions for Codex when modifying any files within this repository. Follow these rules to ensure changes remain consistent with the existing project structure.
+
+## 1. Code Style and Formatting
+- Respect the `.editorconfig` settings located in the repository root. Java files use 4 spaces; HTML, JS, and Python generally use 2 spaces. Lines should end with `LF`.
+- Format Java code with `./gradlew spotlessApply` before committing.
+- Review `DeveloperGuide.md` for project structure and design details before making significant changes.
+
+## 2. Testing
+- Run `./gradlew build` before committing changes to ensure the project compiles.
+- If the build cannot complete due to environment restrictions, DO NOT COMMIT THE CHANGE
+
+## 3. Commits
+- Keep commits focused. Group related changes together and provide concise commit messages.
+- Ensure the working tree is clean (`git status`) before concluding your work.
+
+## 4. Pull Requests
+- Summarize what was changed and why. Include build results from `./gradlew build` in the PR description.
+- Note that the code was generated with the assistance of AI.
+
+## 5. Translations
+- Only modify `messages_en_GB.properties` when adding or updating translations.
+

DeveloperGuide.md

@@ -153,6 +153,7 @@ services:
       SYSTEM_MAXFILESIZE: "100"
       METRICS_ENABLED: "true"
       SYSTEM_GOOGLEVISIBILITY: "true"
+      SHOW_SURVEY: "true"
     restart: on-failure:5
 ```
 
@@ -540,7 +541,7 @@ This would generate n entries of tr for each person in exampleData
 
    ```html
    <li class="nav-item">
-       <a class="nav-link" th:href="@{/new-feature}">New Feature</a>
+       <a class="nav-link" th:href="@{'/new-feature'}">New Feature</a>
    </li>
    ```
 

Dockerfile

@@ -25,20 +25,16 @@ LABEL org.opencontainers.image.keywords="PDF, manipulation, merge, split, conver
 # Set Environment Variables
 ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
-    JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions \
-    -XX:MaxRAMPercentage=75 \
-    -XX:InitiatingHeapOccupancyPercent=20 \
-    -XX:+G1PeriodicGCInvokesConcurrent \
-    -XX:G1PeriodicGCInterval=10000 \
-    -XX:+UseStringDeduplication \
-    -XX:G1PeriodicGCSystemLoadThreshold=70" \
+    JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
+    JAVA_CUSTOM_OPTS="" \
     HOME=/home/stirlingpdfuser \
     PUID=1000 \
     PGID=1000 \
     UMASK=022 \
     PYTHONPATH=/usr/lib/libreoffice/program:/opt/venv/lib/python3.12/site-packages \
     UNO_PATH=/usr/lib/libreoffice/program \
-    URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc
+    URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc \
+    PATH=$PATH:/opt/venv/bin
 
 
 # JDK for app
@@ -66,6 +62,11 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     poppler-utils \
     # OCR MY PDF (unpaper for descew and other advanced features)
     tesseract-ocr-data-eng \
+    tesseract-ocr-data-chi_sim \
+	tesseract-ocr-data-deu \
+	tesseract-ocr-data-fra \
+	tesseract-ocr-data-por \
+    font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra font-liberation font-linux-libertine \
     # CV
     py3-opencv \
     python3 \
@@ -73,24 +74,38 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     py3-pillow@testing \
     py3-pdf2image@testing && \
     python3 -m venv /opt/venv && \
-    export PATH="/opt/venv/bin:$PATH" && \
-    pip install --upgrade pip && \
-    pip install --no-cache-dir --upgrade unoserver weasyprint && \
+    /opt/venv/bin/pip install --upgrade pip && \
+    /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
     ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
-    mv /usr/share/tessdata /usr/share/tessdata-original && \
-    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
+    # Prepare tessdata - copy to permanent location for rootless mode support
+    mkdir -p /usr/share/tessdata && \
+    cp -r /usr/share/tesseract-ocr/*/tessdata/* /usr/share/tessdata/ || true && \
+    # Keep a copy of original tessdata files for non-rootless mode
+    mkdir -p /usr/share/tessdata-original && \
+    cp -r /usr/share/tessdata/* /usr/share/tessdata-original/ || true && \
+    # Create required directories with proper permissions
+    mkdir -p $HOME /configs /logs /customFiles/signatures /customFiles/templates /pipeline/watchedFolders /pipeline/finishedFolders /tmp/stirling-pdf && \
+    # Font cache
     fc-cache -f -v && \
     chmod +x /scripts/* && \
     chmod +x /scripts/init.sh && \
     # User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
+    # Make critical directories and files world-accessible for rootless execution
+    chmod -R 755 /opt/venv /usr/lib/libreoffice && \
+    chmod -R 1777 /configs /logs /customFiles /pipeline /usr/share/tessdata /tmp/stirling-pdf && \
+    chmod 755 /app.jar && \
+    # Ensure specific content directories are accessible
+    mkdir -p /tmp/stirling-pdf && chmod 1777 /tmp/stirling-pdf && \
+    # Set proper permissions for the Java temp dir
+    chmod 1777 /tmp
 
 EXPOSE 8080/tcp
 
 # Set user and run command
 ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
-CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 0.0.0.0"]
+CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]

Dockerfile.dev

@@ -1,53 +1,54 @@
 # dockerfile.dev
 
 # Basisimage: Gradle mit JDK 17 (Debian-basiert)
-FROM gradle:8.12-jdk17
+FROM gradle:8.14-jdk17
 
 # Als Root-Benutzer arbeiten, um benötigte Pakete zu installieren
 USER root
 
+# Set GRADLE_HOME und füge Gradle zum PATH hinzu
+ENV GRADLE_HOME=/opt/gradle
+ENV PATH="$GRADLE_HOME/bin:$PATH"
+
 # Update und Installation zusätzlicher Pakete (Debian/Ubuntu-basiert)
 RUN apt-get update && apt-get install -y \
-  wget \
-  ca-certificates \
-  tzdata \
-  tini \
-  bash \
-  curl \
+  sudo \
   libreoffice \
   poppler-utils \
   qpdf \
+# settings.yml | tessdataDir: /usr/share/tesseract-ocr/5/tessdata
   tesseract-ocr \
   tesseract-ocr-eng \
-  fonts-dejavu \
-  fonts-noto \
-  python3 \
-  python3-pip \
+  fonts-terminus fonts-dejavu fonts-font-awesome fonts-noto fonts-noto-core fonts-noto-cjk fonts-noto-extra fonts-liberation fonts-linuxlibertine \
+  python3-uno \
   python3-venv \
+# ss -tln
+  iproute2 \
   && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Setze die Environment Variable für setuptools
 ENV SETUPTOOLS_USE_DISTUTILS=local
 
 # Installation der benötigten Python-Pakete
-RUN python3 -m venv /opt/venv \
+RUN python3 -m venv --system-site-packages /opt/venv \
   && . /opt/venv/bin/activate \
-  && pip install --upgrade setuptools \
   && pip install --no-cache-dir WeasyPrint pdf2image pillow unoserver opencv-python-headless pre-commit
 
 # Füge den venv-Pfad zur globalen PATH-Variable hinzu, damit die Tools verfügbar sind
 ENV PATH="/opt/venv/bin:$PATH"
 
-# Erstelle notwendige Verzeichnisse und lege einen Nicht‑Root Benutzer an
-RUN mkdir -p /home/devuser/{configs,logs,customFiles,pipeline/watchedFolders,pipeline/finishedFolders} \
-  && adduser --disabled-password --gecos '' devuser \
-  && chown -R devuser:devuser /home/devuser
+COPY . /workspace
 
-RUN mkdir -p /home/devuser/logs /workspace/logs /workspace/scripts /workspace/src/main/resources \
+RUN adduser --disabled-password --gecos '' devuser \
   && chown -R devuser:devuser /home/devuser /workspace
+RUN echo "devuser ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/devuser \
+  && chmod 0440 /etc/sudoers.d/devuser
 
 # Setze das Arbeitsverzeichnis (wird später per Bind-Mount überschrieben)
 WORKDIR /workspace
 
+RUN chmod +x /workspace/.devcontainer/git-init.sh
+RUN sudo chmod +x /workspace/.devcontainer/init-setup.sh
+
 # Wechsel zum Nicht‑Root Benutzer
 USER devuser

Dockerfile.fat

@@ -1,11 +1,11 @@
 # Build the application
-FROM gradle:8.12-jdk21 AS build
+FROM gradle:8.14-jdk21 AS build
 
 COPY build.gradle .
 COPY settings.gradle .
 COPY gradlew .
 COPY gradle gradle/
-RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0 
+RUN ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube || return 0
 
 # Set the working directory
 WORKDIR /app
@@ -32,13 +32,8 @@ ARG VERSION_TAG
 # Set Environment Variables
 ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
-    JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions \
-    -XX:MaxRAMPercentage=75 \
-    -XX:InitiatingHeapOccupancyPercent=20 \
-    -XX:+G1PeriodicGCInvokesConcurrent \
-    -XX:G1PeriodicGCInterval=10000 \
-    -XX:+UseStringDeduplication \
-    -XX:G1PeriodicGCSystemLoadThreshold=70" \
+    JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
+    JAVA_CUSTOM_OPTS="" \
     HOME=/home/stirlingpdfuser \
     PUID=1000 \
     PGID=1000 \
@@ -47,7 +42,8 @@ ENV DOCKER_ENABLE_SECURITY=false \
     INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false \
     PYTHONPATH=/usr/lib/libreoffice/program:/opt/venv/lib/python3.12/site-packages \
     UNO_PATH=/usr/lib/libreoffice/program \
-    URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc
+    URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc \
+    PATH=$PATH:/opt/venv/bin
 
 
 # JDK for app
@@ -75,7 +71,10 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     # OCR MY PDF (unpaper for descew and other advanced featues)
     qpdf \
     tesseract-ocr-data-eng \
-
+    tesseract-ocr-data-chi_sim \
+	tesseract-ocr-data-deu \
+	tesseract-ocr-data-fra \
+	tesseract-ocr-data-por \
     font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra font-liberation font-linux-libertine \
     # CV
     py3-opencv \
@@ -84,23 +83,38 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     py3-pillow@testing \
     py3-pdf2image@testing && \
     python3 -m venv /opt/venv && \
-    export PATH="/opt/venv/bin:$PATH" && \
-    pip install --upgrade pip && \
-    pip install --no-cache-dir --upgrade unoserver weasyprint && \
+    /opt/venv/bin/pip install --upgrade pip && \
+    /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
     ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
-    mv /usr/share/tessdata /usr/share/tessdata-original && \
-    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
+    # Prepare tessdata - copy to permanent location for rootless mode support
+    mkdir -p /usr/share/tessdata && \
+    cp -r /usr/share/tesseract-ocr/*/tessdata/* /usr/share/tessdata/ || true && \
+    # Keep a copy of original tessdata files for non-rootless mode
+    mkdir -p /usr/share/tessdata-original && \
+    cp -r /usr/share/tessdata/* /usr/share/tessdata-original/ || true && \
+    # Create required directories with proper permissions
+    mkdir -p $HOME /configs /logs /customFiles/signatures /customFiles/templates /pipeline/watchedFolders /pipeline/finishedFolders /tmp/stirling-pdf && \
+    # Font cache
     fc-cache -f -v && \
+    # Make scripts executable
     chmod +x /scripts/* && \
     chmod +x /scripts/init.sh && \
     # User permissions
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
+    # Make critical directories and files world-accessible for rootless execution
+    chmod -R 755 /opt/venv /usr/lib/libreoffice && \
+    chmod -R 1777 /configs /logs /customFiles /pipeline /usr/share/tessdata /tmp/stirling-pdf && \
+    chmod 755 /app.jar && \
+    # Ensure specific content directories are accessible
+    mkdir -p /tmp/stirling-pdf && chmod 1777 /tmp/stirling-pdf && \
+    # Set proper permissions for the Java temp dir
+    chmod 1777 /tmp
 
 EXPOSE 8080/tcp
 # Set user and run command
 ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
-CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 0.0.0.0"]
+CMD ["sh", "-c", "java -Dfile.encoding=UTF-8 -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]

Dockerfile.ultra-lite

@@ -7,13 +7,8 @@ ARG VERSION_TAG
 ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
     VERSION_TAG=$VERSION_TAG \
-    JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions \
-    -XX:MaxRAMPercentage=75 \
-    -XX:InitiatingHeapOccupancyPercent=20 \
-    -XX:+G1PeriodicGCInvokesConcurrent \
-    -XX:G1PeriodicGCInterval=10000 \
-    -XX:+UseStringDeduplication \
-    -XX:G1PeriodicGCSystemLoadThreshold=70" \
+    JAVA_BASE_OPTS="-XX:+UnlockExperimentalVMOptions -XX:MaxRAMPercentage=75 -XX:InitiatingHeapOccupancyPercent=20 -XX:+G1PeriodicGCInvokesConcurrent -XX:G1PeriodicGCInterval=10000 -XX:+UseStringDeduplication -XX:G1PeriodicGCSystemLoadThreshold=70" \
+    JAVA_CUSTOM_OPTS="" \
     PUID=1000 \
     PGID=1000 \
     UMASK=022

README.md

@@ -112,56 +112,56 @@ Visit our comprehensive documentation at [docs.stirlingpdf.com](https://docs.sti
 
 ## Supported Languages
 
-Stirling-PDF currently supports 39 languages!
+Stirling-PDF currently supports 40 languages!
 
 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![88%](https://geps.dev/progress/88)   |
-| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![87%](https://geps.dev/progress/87)   |
-| Basque (Euskara) (eu_ES)                     | ![51%](https://geps.dev/progress/51)   |
-| Bulgarian (Български) (bg_BG)                | ![98%](https://geps.dev/progress/98)   |
-| Catalan (Català) (ca_CA)                     | ![79%](https://geps.dev/progress/79)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![85%](https://geps.dev/progress/85)   |
-| Czech (Česky) (cs_CZ)                        | ![96%](https://geps.dev/progress/96)   |
-| Danish (Dansk) (da_DK)                       | ![84%](https://geps.dev/progress/84)   |
-| Dutch (Nederlands) (nl_NL)                   | ![84%](https://geps.dev/progress/84)   |
+| Arabic (العربية) (ar_AR)                        | ![83%](https://geps.dev/progress/83)   |
+| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![82%](https://geps.dev/progress/82)   |
+| Basque (Euskara) (eu_ES)                     | ![48%](https://geps.dev/progress/48)   |
+| Bulgarian (Български) (bg_BG)                | ![92%](https://geps.dev/progress/92)   |
+| Catalan (Català) (ca_CA)                     | ![89%](https://geps.dev/progress/89)   |
+| Croatian (Hrvatski) (hr_HR)                  | ![81%](https://geps.dev/progress/81)   |
+| Czech (Česky) (cs_CZ)                        | ![91%](https://geps.dev/progress/91)   |
+| Danish (Dansk) (da_DK)                       | ![80%](https://geps.dev/progress/80)   |
+| Dutch (Nederlands) (nl_NL)                   | ![79%](https://geps.dev/progress/79)   |
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                    | ![96%](https://geps.dev/progress/96)   |
+| French (Français) (fr_FR)                    | ![92%](https://geps.dev/progress/92)   |
 | German (Deutsch) (de_DE)                     | ![99%](https://geps.dev/progress/99)   |
-| Greek (Ελληνικά) (el_GR)                     | ![96%](https://geps.dev/progress/96)   |
-| Hindi (हिंदी) (hi_IN)                          | ![97%](https://geps.dev/progress/97)   |
-| Hungarian (Magyar) (hu_HU)                   | ![94%](https://geps.dev/progress/94)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![85%](https://geps.dev/progress/85)   |
-| Irish (Gaeilge) (ga_IE)                      | ![96%](https://geps.dev/progress/96)   |
+| Greek (Ελληνικά) (el_GR)                     | ![91%](https://geps.dev/progress/91)   |
+| Hindi (हिंदी) (hi_IN)                          | ![91%](https://geps.dev/progress/91)   |
+| Hungarian (Magyar) (hu_HU)                   | ![99%](https://geps.dev/progress/99)   |
+| Indonesian (Bahasa Indonesia) (id_ID)        | ![80%](https://geps.dev/progress/80)   |
+| Irish (Gaeilge) (ga_IE)                      | ![91%](https://geps.dev/progress/91)   |
 | Italian (Italiano) (it_IT)                   | ![99%](https://geps.dev/progress/99)   |
 | Japanese (日本語) (ja_JP)                    | ![93%](https://geps.dev/progress/93)   |
-| Korean (한국어) (ko_KR)                      | ![97%](https://geps.dev/progress/97)   |
-| Norwegian (Norsk) (no_NB)                    | ![77%](https://geps.dev/progress/77)   |
-| Persian (فارسی) (fa_IR)                      | ![93%](https://geps.dev/progress/93)   |
-| Polish (Polski) (pl_PL)                      | ![84%](https://geps.dev/progress/84)   |
-| Portuguese (Português) (pt_PT)               | ![96%](https://geps.dev/progress/96)   |
+| Korean (한국어) (ko_KR)                      | ![92%](https://geps.dev/progress/92)   |
+| Norwegian (Norsk) (no_NB)                    | ![86%](https://geps.dev/progress/86)   |
+| Persian (فارسی) (fa_IR)                      | ![87%](https://geps.dev/progress/87)   |
+| Polish (Polski) (pl_PL)                      | ![95%](https://geps.dev/progress/95)   |
+| Portuguese (Português) (pt_PT)               | ![91%](https://geps.dev/progress/91)   |
 | Portuguese Brazilian (Português) (pt_BR)     | ![97%](https://geps.dev/progress/97)   |
-| Romanian (Română) (ro_RO)                    | ![79%](https://geps.dev/progress/79)   |
-| Russian (Русский) (ru_RU)                    | ![96%](https://geps.dev/progress/96)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![63%](https://geps.dev/progress/63)   |
-| Simplified Chinese (简体中文) (zh_CN)         | ![98%](https://geps.dev/progress/98)   |
-| Slovakian (Slovensky) (sk_SK)                | ![73%](https://geps.dev/progress/73)   |
-| Slovenian (Slovenščina) (sl_SI)              | ![95%](https://geps.dev/progress/95)   |
-| Spanish (Español) (es_ES)                    | ![98%](https://geps.dev/progress/98)   |
-| Swedish (Svenska) (sv_SE)                    | ![92%](https://geps.dev/progress/92)   |
-| Thai (ไทย) (th_TH)                           | ![84%](https://geps.dev/progress/84)   |
-| Tibetan (བོད་ཡིག་) (zh_BO)                     | ![93%](https://geps.dev/progress/93) |
+| Romanian (Română) (ro_RO)                    | ![75%](https://geps.dev/progress/75)   |
+| Russian (Русский) (ru_RU)                    | ![93%](https://geps.dev/progress/93)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![60%](https://geps.dev/progress/60)   |
+| Simplified Chinese (简体中文) (zh_CN)         | ![93%](https://geps.dev/progress/93)   |
+| Slovakian (Slovensky) (sk_SK)                | ![69%](https://geps.dev/progress/69)   |
+| Slovenian (Slovenščina) (sl_SI)              | ![94%](https://geps.dev/progress/94)   |
+| Spanish (Español) (es_ES)                    | ![99%](https://geps.dev/progress/99)   |
+| Swedish (Svenska) (sv_SE)                    | ![87%](https://geps.dev/progress/87)   |
+| Thai (ไทย) (th_TH)                           | ![80%](https://geps.dev/progress/80)   |
+| Tibetan (བོད་ཡིག་) (zh_BO)                     | ![88%](https://geps.dev/progress/88) |
 | Traditional Chinese (繁體中文) (zh_TW)        | ![99%](https://geps.dev/progress/99)   |
-| Turkish (Türkçe) (tr_TR)                     | ![81%](https://geps.dev/progress/81)   |
-| Ukrainian (Українська) (uk_UA)               | ![71%](https://geps.dev/progress/71)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![78%](https://geps.dev/progress/78)   |
-
+| Turkish (Türkçe) (tr_TR)                     | ![97%](https://geps.dev/progress/97)   |
+| Ukrainian (Українська) (uk_UA)               | ![96%](https://geps.dev/progress/96)   |
+| Vietnamese (Tiếng Việt) (vi_VN)              | ![73%](https://geps.dev/progress/73)   |
+| Malayalam (മലയാളം) (ml_ML)              | ![99%](https://geps.dev/progress/99)   |
 
 ## Stirling PDF Enterprise
 
 Stirling PDF offers an Enterprise edition of its software. This is the same great software but with added features, support and comforts.
-Check out our [Enterprise docs](https://docs.stirlingpdf.com/Enterprise%20Edition)
+Check out our [Enterprise docs](https://docs.stirlingpdf.com/Pro)
 
 
 ## 🤝 Looking to contribute?

build.gradle

@@ -1,31 +1,36 @@
 plugins {
     id "java"
-    id "org.springframework.boot" version "3.4.3"
+    id 'jacoco'
+    id "org.springframework.boot" version "3.4.5"
     id "io.spring.dependency-management" version "1.1.7"
-    id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
+    id "org.springdoc.openapi-gradle-plugin" version "1.9.0"
     id "io.swagger.swaggerhub" version "1.3.2"
     id "edu.sc.seis.launch4j" version "3.0.6"
-    id "com.diffplug.spotless" version "7.0.2"
+    id "com.diffplug.spotless" version "7.0.3"
     id "com.github.jk1.dependency-license-report" version "2.9"
     //id "nebula.lint" version "19.0.3"
     id("org.panteleyev.jpackageplugin") version "1.6.1"
-    id "org.sonarqube" version "6.0.1.5171"
+    id "org.sonarqube" version "6.2.0.5505"
 }
 
 import com.github.jk1.license.render.*
+import org.gradle.internal.os.OperatingSystem
+import java.nio.file.Files
+import java.time.Year
 
 ext {
-    springBootVersion = "3.4.3"
-    pdfboxVersion = "3.0.4"
+    springBootVersion = "3.4.5"
+    pdfboxVersion = "3.0.5"
     imageioVersion = "3.12.0"
-    lombokVersion = "1.18.36"
+    lombokVersion = "1.18.38"
     bouncycastleVersion = "1.80"
-    springSecuritySamlVersion = "6.4.3"
+    springSecuritySamlVersion = "6.5.0"
     openSamlVersion = "4.3.2"
+    tempJrePath = null
 }
 
 group = "stirling.software"
-version = "0.44.1"
+version = "0.46.2"
 
 java {
     // 17 is lowest but we support and recommend 21
@@ -47,16 +52,20 @@ sourceSets {
     main {
         java {
             if (System.getenv("DOCKER_ENABLE_SECURITY") == "false") {
+                exclude "stirling/software/SPDF/config/interfaces/DatabaseInterface.java"
                 exclude "stirling/software/SPDF/config/security/**"
                 exclude "stirling/software/SPDF/controller/api/DatabaseController.java"
-                exclude "stirling/software/SPDF/controller/api/UserController.java"
+                exclude "stirling/software/SPDF/controller/api/EmailController.java"
                 exclude "stirling/software/SPDF/controller/api/H2SQLCondition.java"
+                exclude "stirling/software/SPDF/controller/api/UserController.java"
                 exclude "stirling/software/SPDF/controller/web/AccountWebController.java"
                 exclude "stirling/software/SPDF/controller/web/DatabaseWebController.java"
+                exclude "stirling/software/SPDF/model/api/Email.java"
                 exclude "stirling/software/SPDF/model/ApiKeyAuthenticationToken.java"
                 exclude "stirling/software/SPDF/model/AttemptCounter.java"
                 exclude "stirling/software/SPDF/model/Authority.java"
-                exclude "stirling/software/SPDF/model/BackupNotFoundException.java"
+                exclude "stirling/software/SPDF/model/exception/BackupNotFoundException.java"
+                exclude "stirling/software/SPDF/model/exception/NoProviderFoundException.java"
                 exclude "stirling/software/SPDF/model/PersistentLogin.java"
                 exclude "stirling/software/SPDF/model/SessionEntity.java"
                 exclude "stirling/software/SPDF/model/User.java"
@@ -74,16 +83,8 @@ sourceSets {
         java {
             if (System.getenv("DOCKER_ENABLE_SECURITY") == "false") {
                 exclude "stirling/software/SPDF/config/security/**"
-                exclude "stirling/software/SPDF/controller/api/UserControllerTest.java"
-                exclude "stirling/software/SPDF/controller/api/DatabaseControllerTest.java"
-                exclude "stirling/software/SPDF/controller/web/AccountWebControllerTest.java"
-                exclude "stirling/software/SPDF/controller/web/DatabaseWebControllerTest.java"
                 exclude "stirling/software/SPDF/model/ApiKeyAuthenticationTokenTest.java"
-                exclude "stirling/software/SPDF/model/AttemptCounterTest.java"
-                exclude "stirling/software/SPDF/model/AuthorityTest.java"
-                exclude "stirling/software/SPDF/model/PersistentLoginTest.java"
-                exclude "stirling/software/SPDF/model/SessionEntityTest.java"
-                exclude "stirling/software/SPDF/model/UserTest.java"
+                exclude "stirling/software/SPDF/controller/api/EmailControllerTest.java"
                 exclude "stirling/software/SPDF/repository/**"
             }
 
@@ -98,11 +99,12 @@ openApi {
     apiDocsUrl = "http://localhost:8080/v1/api-docs"
     outputDir = file("$projectDir")
     outputFileName = "SwaggerDoc.json"
+    waitTimeInSeconds = 60 // Increase the wait time to 60 seconds
 }
 
 //0.11.5 to 2024.11.5
-def getMacVersion(String version) {
-    def currentYear = java.time.Year.now().getValue()
+static def getMacVersion(String version) {
+    def currentYear = Year.now().getValue()
     def versionParts = version.split("\\.", 2)
     return "${currentYear}.${versionParts.length > 1 ? versionParts[1] : versionParts[0]}"
 }
@@ -111,9 +113,10 @@ jpackage {
     input = "build/libs"
     destination = "${projectDir}/build/jpackage"
     mainJar = "Stirling-PDF-${project.version}.jar"
-    appName = "Stirling-PDF"
+    appName = "Stirling PDF"
     appVersion = project.version
-    vendor = "Stirling-Software"
+//    appVersion = "2005.45.1"
+    vendor = "Stirling PDF Inc"
     appDescription = "Stirling PDF - Your Local PDF Editor"
     icon = "src/main/resources/static/favicon.ico"
     verbose = true
@@ -145,7 +148,7 @@ jpackage {
         winShortcutPrompt = true  // Lets user choose whether to create shortcuts
         winDirChooser = true  // Allows users to choose installation directory
         winPerUserInstall = false
-        winMenuGroup = "Stirling Software"
+        winMenuGroup = "Stirling PDF"
         winUpgradeUuid = "2a43ed0c-b8c2-40cf-89e1-751129b87641" // Unique identifier for updates
         winHelpUrl = "https://github.com/Stirling-Tools/Stirling-PDF"
         winUpdateUrl = "https://github.com/Stirling-Tools/Stirling-PDF/releases"
@@ -158,23 +161,21 @@ jpackage {
         appVersion = getMacVersion(project.version.toString())
         icon = "src/main/resources/static/favicon.icns"
         type = "dmg"
-        macPackageIdentifier = "com.stirling.software.pdf"
-        macPackageName = "Stirling-PDF"
+        macPackageIdentifier = "Stirling PDF"
+        macPackageName = "Stirling PDF"
         macAppCategory = "public.app-category.productivity"
         macSign = false // Enable signing
         macAppStore = false // Not targeting App Store initially
 
-        //installDir = "Applications"
-
-        // Add license and other documentation to DMG
-        /*macDmgContent = [
-            "README.md",
-            "LICENSE",
-            "CHANGELOG.md"
-        ]*/
-
-        // Enable Mac-specific entitlements
-        //macEntitlements = "entitlements.plist" // You'll need to create this file
+//        // Add license and other documentation to DMG
+//        /*macDmgContent = [
+//            "README.md",
+//            "LICENSE",
+//            "CHANGELOG.md"
+//        ]*/
+//
+//        // Enable Mac-specific entitlements
+//        //macEntitlements = "entitlements.plist" // You'll need to create this file
     }
 
     // Linux-specific configuration
@@ -220,6 +221,123 @@ jpackage {
     licenseFile = "LICENSE"
 }
 
+tasks.register('jpackageMacX64') {
+    group = 'distribution'
+    description = 'Packages app for MacOS x86_64'
+
+    println "Running jpackageMacX64 task"
+
+    if (OperatingSystem.current().isMacOsX()) {
+        println "MacOS detected. Downloading temp JRE."
+        dependsOn("downloadTempJre")
+    } else {
+        return
+    }
+
+    doLast {
+        def jrePath = project.ext.tempJrePath
+
+        if (!jrePath) {
+            throw new GradleException("JRE path not found.")
+        }
+
+        def outputStream = new ByteArrayOutputStream()
+        def errorStream = new ByteArrayOutputStream()
+
+        def result = exec {
+            commandLine 'jpackage',
+                '--type', 'dmg',
+                '--name', 'Stirling PDF (x86_64)',
+                '--input', 'build/libs',
+                '--main-jar', "Stirling-PDF-${project.version}.jar",
+                '--main-class', 'org.springframework.boot.loader.launch.JarLauncher',
+                '--runtime-image', file(jrePath + "/zulu-17.jre/Contents/Home"),
+                '--dest', 'build/jpackage/x86_64',
+                '--icon', 'src/main/resources/static/favicon.icns',
+                '--app-version', getMacVersion(project.version.toString()),
+                '--mac-package-name', 'Stirling PDF (x86_64)',
+                '--mac-package-identifier', 'Stirling PDF (x86_64)',
+                '--mac-app-category', 'public.app-category.productivity',
+
+                // Java options
+                '--java-options', '-DBROWSER_OPEN=true',
+                '--java-options', '-DSTIRLING_PDF_DESKTOP_UI=true',
+                '--java-options', '-Djava.awt.headless=false',
+                '--java-options', '-Dapple.awt.UIElement=true',
+                '--java-options', '--add-opens=java.base/java.lang=ALL-UNNAMED',
+                '--java-options', '--add-opens=java.desktop/java.awt.event=ALL-UNNAMED',
+                '--java-options', '--add-opens=java.desktop/sun.awt=ALL-UNNAMED',
+                '--java-options', '--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED',
+                '--java-options', '--add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED',
+                '--java-options', '--add-opens=java.desktop/sun.lwawt=ALL-UNNAMED',
+                '--java-options', '--add-opens=java.desktop/sun.lwawt.macosx=ALL-UNNAMED'
+
+            standardOutput = outputStream
+            errorOutput = errorStream
+            ignoreExitValue = true
+        }
+
+        def stdout = outputStream.toString("UTF-8")
+        def stderr = errorStream.toString("UTF-8")
+
+        if (!stdout.isBlank()) {
+            println "jpackage stdout:\n$stdout"
+        }
+
+        if (result.exitValue != 0) {
+            throw new GradleException("jpackage failed with exit code ${result.exitValue}.\n\n$stderr")
+        }
+    }
+}
+
+//jpackage.finalizedBy(jpackageMacX64)
+
+tasks.register('downloadTempJre') {
+    group = 'distribution'
+    description = 'Downloads and extracts a temporary JRE'
+
+    doLast {
+        try {
+            def jreUrl = 'https://cdn.azul.com/zulu/bin/zulu17.56.15-ca-jre17.0.14-macosx_x64.tar.gz'
+            def tmpDir = Files.createTempDirectory('zulu-jre').toFile()
+            def jreArchive = new File(tmpDir, 'jre.tar.gz')
+            def jreDir = new File(tmpDir, 'jre')
+
+            println "🔽 Downloading JRE to $jreArchive..."
+            jreArchive.withOutputStream { out ->
+                new URI(jreUrl).toURL().withInputStream { from -> out << from }
+            }
+
+            println "📦 Extracting JRE to $jreDir..."
+            jreDir.mkdirs()
+            providers.exec {
+                commandLine 'tar', '-xzf', jreArchive.absolutePath, '-C', jreDir.absolutePath, '--strip-components=1'
+            }.result.get()
+
+            println "✅ JRE ready at: $jreDir"
+            ext.tempJrePath = jreDir.absolutePath
+            project.ext.tempJrePath = jreDir.absolutePath
+        } catch (Exception e) {
+            println "Failed to download JRE. ${e.getLocalizedMessage()}"
+            cleanTempJre
+        }
+    }
+}
+
+tasks.register('cleanTempJre') {
+    dependsOn('jpackageMacX64')
+    group = 'distribution'
+    description = 'Deletes the temporary JRE'
+
+    doLast {
+        def path = project.ext.tempJrePath
+
+        if (path && new File("$path").exists()) {
+            println "Cleaning up temporary JRE: $path"
+            new File("$path").parentFile.deleteDir()
+        }
+    }
+}
 
 launch4j {
     icon = "${projectDir}/src/main/resources/static/favicon.ico"
@@ -256,9 +374,9 @@ launch4j {
 
 spotless {
     java {
-        target project.fileTree('src/main/java')
+        target project.fileTree('src').include('**/*.java')
 
-        googleJavaFormat("1.25.2").aosp().reorderImports(false)
+        googleJavaFormat("1.26.0").aosp().reorderImports(false)
 
         importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
         toggleOffOn()
@@ -283,19 +401,23 @@ sonar {
 //        rules=['unused-dependency']
 //    }
 tasks.wrapper {
-    gradleVersion = "8.12"
+    gradleVersion = "8.14"
+    distributionType = Wrapper.DistributionType.ALL
 }
 //tasks.withType(JavaCompile) {
 //    options.compilerArgs << "-Xlint:deprecation"
 //}
 configurations.all {
+    // Remove all commons-logging dependencies so that only spring-jcl is used
+    exclude group: 'commons-logging', module: 'commons-logging'
+    // Exclude Tomcat
     exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
 }
 dependencies {
 
     //tmp for security bumps
-	implementation 'ch.qos.logback:logback-core:1.5.17'
-    implementation 'ch.qos.logback:logback-classic:1.5.17'
+    implementation 'ch.qos.logback:logback-core:1.5.18'
+    implementation 'ch.qos.logback:logback-classic:1.5.18'
 
 
     // Exclude vulnerable BouncyCastle version used in tableau
@@ -312,7 +434,7 @@ dependencies {
     }
 
     //security updates
-    implementation "org.springframework:spring-webmvc:6.2.3"
+    implementation "org.springframework:spring-webmvc:6.2.7"
 
     implementation("io.github.pixee:java-security-toolkit:1.2.1")
 
@@ -326,13 +448,18 @@ dependencies {
 
 
     if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
+
+	    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	    implementation 'io.micrometer:micrometer-registry-prometheus'
+
         implementation "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
         implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.3.RELEASE"
         implementation "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
         implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
+        implementation "org.springframework.boot:spring-boot-starter-mail:$springBootVersion"
 
-        implementation "org.springframework.session:spring-session-core:3.4.2"
-        implementation "org.springframework:spring-jdbc:6.2.3"
+        implementation "org.springframework.session:spring-session-core:3.4.3"
+        implementation "org.springframework:spring-jdbc:6.2.7"
 
         implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
         // Don't upgrade h2database
@@ -353,7 +480,7 @@ dependencies {
     testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 
     // Batik
-    implementation "org.apache.xmlgraphics:batik-all:1.18"
+    implementation "org.apache.xmlgraphics:batik-all:1.19"
 
     // TwelveMonkeys
     runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
@@ -376,24 +503,18 @@ dependencies {
     // Image metadata extractor
     implementation "com.drewnoakes:metadata-extractor:2.19.0"
 
-    implementation "commons-io:commons-io:2.18.0"
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"
+    implementation "commons-io:commons-io:2.19.0"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8"
     //general PDF
 
     // https://mvnrepository.com/artifact/com.opencsv/opencsv
-    implementation ("com.opencsv:opencsv:5.10") {
-        exclude group: "commons-logging", module: "commons-logging"
-    }
+    implementation ("com.opencsv:opencsv:5.11")
 
-    implementation ("org.apache.pdfbox:pdfbox:$pdfboxVersion") {
-        exclude group: "commons-logging", module: "commons-logging"
-    }
+    implementation ("org.apache.pdfbox:pdfbox:$pdfboxVersion")
     implementation "org.apache.pdfbox:preflight:$pdfboxVersion"
 
 
-    implementation ("org.apache.pdfbox:xmpbox:$pdfboxVersion") {
-        exclude group: "commons-logging", module: "commons-logging"
-    }
+    implementation ("org.apache.pdfbox:xmpbox:$pdfboxVersion")
 
     // https://mvnrepository.com/artifact/technology.tabula/tabula
     implementation ('technology.tabula:tabula:1.0.5')  {
@@ -407,14 +528,14 @@ dependencies {
     implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
     implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
     implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    implementation "io.micrometer:micrometer-core:1.14.4"
+    implementation "io.micrometer:micrometer-core:1.15.0"
     implementation group: "com.google.zxing", name: "core", version: "3.5.3"
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
     implementation "org.commonmark:commonmark:0.24.0"
     implementation "org.commonmark:commonmark-ext-gfm-tables:0.24.0"
     // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17
     implementation "com.bucket4j:bucket4j_jdk17-core:8.14.0"
-    implementation "com.fathzer:javaluator:3.0.5"
+    implementation "com.fathzer:javaluator:3.0.6"
 
     implementation 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
 
@@ -422,6 +543,10 @@ dependencies {
     compileOnly "org.projectlombok:lombok:$lombokVersion"
     annotationProcessor "org.projectlombok:lombok:$lombokVersion"
 
+  // Mockito (core)
+    testImplementation 'org.mockito:mockito-core:5.17.0'
+
+    
     testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
 }
 
@@ -434,18 +559,28 @@ compileJava {
 }
 
 task writeVersion {
-    def propsFile = file("src/main/resources/version.properties")
-    def props = new Properties()
-    props.setProperty("version", version)
-    props.store(propsFile.newWriter(), null)
+    def propsFile = file("$projectDir/src/main/resources/version.properties")
+    def propsDir = propsFile.parentFile
+
+    doLast {
+        if (!propsDir.exists()) {
+            propsDir.mkdirs()
+        }
+
+        def props = new Properties()
+        props.setProperty("version", version)
+        props.store(propsFile.newWriter(), null)
+    }
 }
 
+processResources.dependsOn(writeVersion)
+
 swaggerhubUpload {
     // dependsOn = generateOpenApiDocs  // Depends on your task generating Swagger docs
     api = "Stirling-PDF"  // The name of your API on SwaggerHub
-    owner = "Frooodle"  // Your SwaggerHub username (or organization name)
+    owner = "${System.getenv().getOrDefault('SWAGGERHUB_USER', 'Frooodle')}"  // Your SwaggerHub username (or organization name)
     version = project.version  // The version of your API
-    inputFile = "./SwaggerDoc.json"  // The path to your Swagger docs
+    inputFile = file("SwaggerDoc.json")  // The path to your Swagger docs
     token = "${System.getenv("SWAGGERHUB_API_KEY")}"  // Your SwaggerHub API key, passed as an environment variable
     oas = "3.0.0"  // The version of the OpenAPI Specification you"re using
 }
@@ -456,12 +591,12 @@ jar {
         attributes "Implementation-Title": "Stirling-PDF",
                    "Implementation-Version": project.version
     }
-
 }
 
 tasks.named("test") {
     useJUnitPlatform()
 }
+
 task printVersion {
     doLast {
         println project.version
@@ -473,3 +608,7 @@ task printMacVersion {
         println getMacVersion(project.version.toString())
     }
 }
+
+tasks.named('generateOpenApiDocs') {
+    doNotTrackState("Tracking state is not supported for this task")
+}

exampleYmlFiles/docker-compose-latest-fat-endpoints-disabled.yml

@@ -0,0 +1,36 @@
+
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF-Fat-Disable-Endpoints
+    image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest-fat
+    deploy:
+      resources:
+        limits:
+          memory: 4G
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP'"]
+      interval: 5s
+      timeout: 10s
+      retries: 16
+    ports:
+      - 8080:8080
+    volumes:
+      - ./stirling/latest/data:/usr/share/tessdata:rw
+      - ./stirling/latest/config:/configs:rw
+      - ./stirling/latest/logs:/logs:rw
+      - ../testing/allEndpointsRemovedSettings.yml:/configs/settings.yml:rw
+    environment:
+      DOCKER_ENABLE_SECURITY: "true"
+      SECURITY_ENABLELOGIN: "false"
+      PUID: 1002
+      PGID: 1002
+      UMASK: "022"
+      SYSTEM_DEFAULTLOCALE: en-US
+      UI_APPNAME: Stirling-PDF
+      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest-fat with  all Endpoints Disabled
+      UI_APPNAMENAVBAR: Stirling-PDF Latest-fat
+      SYSTEM_MAXFILESIZE: "100"
+      METRICS_ENABLED: "true"
+      SYSTEM_GOOGLEVISIBILITY: "true"
+      SHOW_SURVEY: "true"
+    restart: on-failure:5

exampleYmlFiles/docker-compose-latest-fat-security-postgres.yml

@@ -36,6 +36,7 @@ services:
       SYSTEM_DATASOURCE_CUSTOMDATABASEURL: "jdbc:postgresql://db:5432/stirling_pdf"
       SYSTEM_DATASOURCE_USERNAME: "admin"
       SYSTEM_DATASOURCE_PASSWORD: "stirling"
+      SHOW_SURVEY: "true"
     restart: on-failure:5
 
   db:

exampleYmlFiles/docker-compose-latest-fat-security.yml

@@ -30,4 +30,5 @@ services:
       SYSTEM_MAXFILESIZE: "100"
       METRICS_ENABLED: "true"
       SYSTEM_GOOGLEVISIBILITY: "true"
+      SHOW_SURVEY: "true"
     restart: on-failure:5

exampleYmlFiles/docker-compose-latest-rootless.yml

@@ -0,0 +1,35 @@
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF
+    # Use the fat version for rootless operation as it includes all dependencies
+    image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest-fat
+    # Run as a non-root user - this is the key part for rootless operation
+    # Use the user directive to specify the numerical UID:GID
+    # Use the UID of your host user to ensure proper file permissions
+    # Example: user: "1000:1000"
+    user: "1000:1000"
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -qv 'Please sign in'"]
+      interval: 5s
+      timeout: 10s
+      retries: 16
+    ports:
+      - "8080:8080"
+    volumes:
+      # When running rootless, make sure these directories:
+      # 1. Exist on the host
+      # 2. Are owned by the same UID as specified in the user directive above
+      # 3. Have appropriate permissions (at least 755 or 777 for directories)
+      - /stirling/rootless/data:/usr/share/tessdata:rw
+      - /stirling/rootless/config:/configs:rw
+      - /stirling/rootless/logs:/logs:rw
+      - /stirling/rootless/customFiles:/customFiles:rw
+      - /stirling/rootless/pipeline:/pipeline:rw
+    environment:
+      DOCKER_ENABLE_SECURITY: "false"
+      SECURITY_ENABLELOGIN: "false"
+      LANGS: "en_GB,en_US,ar_AR,de_DE,fr_FR,es_ES,zh_CN,zh_TW,ca_CA,it_IT,sv_SE,pl_PL,ro_RO,ko_KR,pt_BR,ru_RU,el_GR,hi_IN,hu_HU,tr_TR,id_ID"
+      SYSTEM_DEFAULTLOCALE: en-US
+      SYSTEM_MAXFILESIZE: "100"
+      SYSTEM_GOOGLEVISIBILITY: "true"
+    restart: on-failure:5

exampleYmlFiles/docker-compose-latest-security-with-sso.yml

@@ -38,4 +38,5 @@ services:
       SYSTEM_MAXFILESIZE: "100"
       METRICS_ENABLED: "true"
       SYSTEM_GOOGLEVISIBILITY: "true"
+      SHOW_SURVEY: "true"
     restart: on-failure:5

exampleYmlFiles/docker-compose-latest-security.yml

@@ -30,4 +30,5 @@ services:
       SYSTEM_MAXFILESIZE: "100"
       METRICS_ENABLED: "true"
       SYSTEM_GOOGLEVISIBILITY: "true"
+      SHOW_SURVEY: "true"
     restart: on-failure:5

exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml

@@ -27,4 +27,5 @@ services:
       SYSTEM_MAXFILESIZE: "100"
       METRICS_ENABLED: "true"
       SYSTEM_GOOGLEVISIBILITY: "true"
+      SHOW_SURVEY: "true"
     restart: on-failure:5

exampleYmlFiles/docker-compose-latest-ultra-lite.yml

@@ -26,4 +26,5 @@ services:
       SYSTEM_MAXFILESIZE: "100"
       METRICS_ENABLED: "true"
       SYSTEM_GOOGLEVISIBILITY: "true"
+      SHOW_SURVEY: "true"
     restart: on-failure:5

exampleYmlFiles/docker-compose-latest.yml

@@ -28,4 +28,5 @@ services:
       SYSTEM_MAXFILESIZE: "100"
       METRICS_ENABLED: "true"
       SYSTEM_GOOGLEVISIBILITY: "true"
+      SHOW_SURVEY: "true"
     restart: on-failure:5

exampleYmlFiles/test_cicd.yml

@@ -1,7 +1,7 @@
 services:
   stirling-pdf:
     container_name: Stirling-PDF-Security-Fat-with-login
-    image: stirlingtools/stirling-pdf:latest-fat
+    image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest-fat
     deploy:
       resources:
         limits:

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

scripts/ignore_translation.toml

@@ -56,6 +56,9 @@ ignore = [
     'validateSignature.cert.version',
     'validateSignature.status',
     'watermark.type.1',
+    'endpointStatistics.top10',
+    'endpointStatistics.top20',
+    'cookieBanner.popUp.acceptAllBtn',
 ]
 
 [el_GR]

scripts/init-setup.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-whoami
-
-cd "$(dirname "$0")/.."
-
-echo "Devcontainer started..."

scripts/init-without-ocr.sh

@@ -1,37 +1,87 @@
 #!/bin/bash
 
-# Update the user and group IDs as per environment variables
-if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then
-    usermod -o -u "$PUID" stirlingpdfuser || true
+export JAVA_TOOL_OPTIONS="${JAVA_BASE_OPTS} ${JAVA_CUSTOM_OPTS}"
+echo "running with JAVA_TOOL_OPTIONS ${JAVA_BASE_OPTS} ${JAVA_CUSTOM_OPTS}"
+
+# Detect if we're running as root (UID 0)
+RUNNING_AS_ROOT=false
+if [ "$(id -u)" -eq 0 ]; then
+    RUNNING_AS_ROOT=true
+    echo "Running container as root, will attempt to drop privileges"
 fi
 
+# Only attempt user/group modifications if running as root
+if [ "$RUNNING_AS_ROOT" = true ]; then
+    # Update the user and group IDs as per environment variables
+    if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then
+        usermod -o -u "$PUID" stirlingpdfuser || echo "[WARN] Failed to update UID for stirlingpdfuser"
+    fi
 
-if [ ! -z "$PGID" ] && [ "$PGID" != "$(getent group stirlingpdfgroup | cut -d: -f3)" ]; then
-    groupmod -o -g "$PGID" stirlingpdfgroup || true
+    if [ ! -z "$PGID" ] && [ "$PGID" != "$(getent group stirlingpdfgroup | cut -d: -f3)" ]; then
+        groupmod -o -g "$PGID" stirlingpdfgroup || echo "[WARN] Failed to update GID for stirlingpdfgroup"
+    fi
 fi
+
+# Apply umask in either case
 umask "$UMASK" || true
 
-if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" && "$FAT_DOCKER" != "true" ]]; then
-  echo "issue with calibre in current version, feature currently disabled on Stirling-PDF"
-  #apk add --no-cache calibre@testing
+
+# Skip download for fat Docker (already has security jar)
+if [[ "$FAT_DOCKER" != "true" && "$RUNNING_AS_ROOT" = true ]]; then
+  echo "Downloading security JAR (not necessary in fat Docker image)..."
+  /scripts/download-security-jar.sh
+elif [[ "$FAT_DOCKER" != "true" && "$RUNNING_AS_ROOT" != true ]]; then
+  echo "[INFO] Skipping security JAR download in rootless mode"
 fi
 
-if [[ "$FAT_DOCKER" != "true" ]]; then
-  /scripts/download-security-jar.sh	
-fi
-
-if [[ -n "$LANGS" ]]; then
+# Handle font installation
+if [[ -n "$LANGS" && "$RUNNING_AS_ROOT" = true ]]; then
+  echo "Installing fonts for languages: $LANGS"
   /scripts/installFonts.sh $LANGS
+elif [[ -n "$LANGS" && "$RUNNING_AS_ROOT" != true ]]; then
+  echo "[INFO] Skipping font installation in rootless mode"
 fi
 
-echo "Setting permissions and ownership for necessary directories..."
-# Attempt to change ownership of directories and files
-if chown -R stirlingpdfuser:stirlingpdfgroup $HOME /logs /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /app.jar; then
-	chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /app.jar || true
-    # If chown succeeds, execute the command as stirlingpdfuser
-    exec su-exec stirlingpdfuser "$@"
+# Directory list we need to ensure are accessible
+DIRS_TO_CHECK="$HOME /logs /scripts /usr/share/fonts/opentype/noto /configs /customFiles /customFiles/signatures /customFiles/templates /pipeline /pipeline/watchedFolders /pipeline/finishedFolders /usr/share/tessdata /tmp /tmp/stirling-pdf"
+FILES_TO_CHECK="/app.jar"
+
+# Skip copying tessdata files in rootless mode to avoid the error message
+if [ "$RUNNING_AS_ROOT" = true ]; then
+    # We're running as root, so try to copy tessdata files if they exist
+    if [ -d "/usr/share/tessdata-original" ]; then
+        echo "Copying original files without overwriting existing files"
+        cp -n /usr/share/tessdata-original/* /usr/share/tessdata/ 2>/dev/null || true
+    fi
+    
+    echo "Setting permissions and ownership for necessary directories..."
+    # Attempt to change ownership of directories and files if running as root
+    if chown -R stirlingpdfuser:stirlingpdfgroup $DIRS_TO_CHECK $FILES_TO_CHECK; then
+        chmod -R 755 $DIRS_TO_CHECK $FILES_TO_CHECK || echo "[WARN] Failed to set directory permissions, but continuing"
+        # If chown succeeds, execute the command as stirlingpdfuser
+        echo "Running as stirlingpdfuser"
+        exec su-exec stirlingpdfuser "$@"
+    else
+        # If chown fails, still try to make files accessible
+        echo "[WARN] Chown failed, but will attempt to make files world-accessible"
+        chmod -R 1777 /logs /configs /customFiles /pipeline || true
+        echo "[WARN] Running as root user - could not drop privileges"
+        exec "$@"
+    fi
 else
-    # If chown fails, execute the command without changing the user context
-    echo "[WARN] Chown failed, running as host user"
+    # Already running as non-root (rootless mode)
+    echo "Running in rootless mode"
+    
+    # In rootless mode, we'll only check critical paths that must be writable
+    CRITICAL_DIRS="/configs /logs /customFiles /customFiles/signatures /customFiles/templates /pipeline/watchedFolders /pipeline/finishedFolders"
+    
+    for DIR in $CRITICAL_DIRS; do
+        if [ -d "$DIR" ] && [ ! -w "$DIR" ]; then
+            echo "[WARN] Cannot write to $DIR in rootless mode. Some functionality may be limited."
+        fi
+    done
+    
+    # Just execute the command as the current user
+    echo "Executing as current user (UID: $(id -u))"
     exec "$@"
 fi

scripts/prepare-for-rootless.sh

@@ -0,0 +1,160 @@
+#!/bin/bash
+
+# This script helps prepare your host environment for running Stirling-PDF in rootless mode
+# It creates the necessary directories with appropriate permissions
+
+# Set text colors
+GREEN='\033[0;32m'
+YELLOW='\033[0;33m'
+NC='\033[0m' # No Color
+
+# Usage information
+print_usage() {
+    echo "Usage: $0 [OPTIONS]"
+    echo ""
+    echo "Options:"
+    echo "  -d, --base-dir DIR     Base directory for Stirling-PDF data (default: /stirling/rootless)"
+    echo "  -u, --uid UID          User ID to set as owner (default: current user ID)"
+    echo "  -g, --gid GID          Group ID to set as owner (default: current group ID)"
+    echo "  -h, --help             Show this help message"
+    echo ""
+    echo "Example:"
+    echo "  $0 --base-dir ~/stirling-data --uid 1000 --gid 1000"
+}
+
+# Default values
+BASE_DIR="/stirling/rootless"
+UID_VAL=$(id -u)
+GID_VAL=$(id -g)
+
+# Parse command line arguments
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        -d|--base-dir)
+            BASE_DIR="$2"
+            shift 2
+            ;;
+        -u|--uid)
+            UID_VAL="$2"
+            shift 2
+            ;;
+        -g|--gid)
+            GID_VAL="$2"
+            shift 2
+            ;;
+        -h|--help)
+            print_usage
+            exit 0
+            ;;
+        *)
+            echo "Error: Unknown option: $1"
+            print_usage
+            exit 1
+            ;;
+    esac
+done
+
+# Validate inputs
+if [[ ! "$UID_VAL" =~ ^[0-9]+$ ]]; then
+    echo "Error: UID must be a number"
+    exit 1
+fi
+
+if [[ ! "$GID_VAL" =~ ^[0-9]+$ ]]; then
+    echo "Error: GID must be a number"
+    exit 1
+fi
+
+echo -e "${YELLOW}Setting up directories for Stirling-PDF rootless mode${NC}"
+echo "==============================================="
+echo "UID: $UID_VAL"
+echo "GID: $GID_VAL"
+echo "Base directory: $BASE_DIR"
+echo
+
+# Create base directory if it doesn't exist
+if [ ! -d "$BASE_DIR" ]; then
+    echo "Creating base directory: $BASE_DIR"
+    mkdir -p "$BASE_DIR" || { echo "Failed to create base directory"; exit 1; }
+fi
+
+# Create necessary subdirectories
+DIRS=(
+    "data" 
+    "config" 
+    "logs" 
+    "customFiles" 
+    "customFiles/signatures"
+    "customFiles/templates"
+    "pipeline/watchedFolders" 
+    "pipeline/finishedFolders"
+)
+
+for DIR in "${DIRS[@]}"; do
+    FULL_PATH="$BASE_DIR/$DIR"
+    echo "Creating directory: $FULL_PATH"
+    mkdir -p "$FULL_PATH" || { echo "Failed to create directory: $FULL_PATH"; exit 1; }
+    
+    echo "Setting ownership to $UID_VAL:$GID_VAL for $FULL_PATH"
+    chown -R "$UID_VAL:$GID_VAL" "$FULL_PATH" || { echo "Warning: Failed to change ownership for $FULL_PATH"; }
+    
+    echo "Setting permissions for $FULL_PATH"
+    chmod -R 1777 "$FULL_PATH" || { echo "Warning: Failed to set permissions for $FULL_PATH"; }
+done
+
+# Create a Docker Compose file for rootless mode if it doesn't exist
+COMPOSE_FILE="$BASE_DIR/docker-compose-rootless.yml"
+if [ ! -f "$COMPOSE_FILE" ]; then
+    echo "Creating Docker Compose file for rootless mode: $COMPOSE_FILE"
+    cat > "$COMPOSE_FILE" << EOL
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF-Rootless
+    # Use the fat version for rootless operation as it includes all dependencies
+    image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest-fat
+    user: "$UID_VAL:$GID_VAL"
+    ports:
+      - "8080:8080"
+    volumes:
+      - $BASE_DIR/data:/usr/share/tessdata:rw
+      - $BASE_DIR/config:/configs:rw
+      - $BASE_DIR/logs:/logs:rw
+      - $BASE_DIR/customFiles:/customFiles:rw
+      - $BASE_DIR/pipeline:/pipeline:rw
+    environment:
+      DOCKER_ENABLE_SECURITY: "false"
+      SECURITY_ENABLELOGIN: "false"
+      SYSTEM_DEFAULTLOCALE: en-US
+      UI_APPNAME: Stirling-PDF
+      UI_HOMEDESCRIPTION: Stirling-PDF Rootless
+      UI_APPNAMENAVBAR: Stirling-PDF Rootless
+    restart: unless-stopped
+EOL
+    echo "Docker Compose file created"
+fi
+
+echo -e "${GREEN}"
+echo "==============================================="
+echo "Preparation complete!"
+echo "===============================================${NC}"
+echo ""
+echo "To run Stirling-PDF in rootless mode:"
+echo ""
+echo -e "${YELLOW}Option 1: Using the generated docker-compose file:${NC}"
+echo "cd $BASE_DIR"
+echo "docker-compose -f docker-compose-rootless.yml up -d"
+echo ""
+echo -e "${YELLOW}Option 2: Manual docker run command:${NC}"
+echo "docker run -d \\"
+echo "  --name stirling-pdf-rootless \\"
+echo "  --user \"$UID_VAL:$GID_VAL\" \\"
+echo "  -p 8080:8080 \\"
+echo "  -v $BASE_DIR/data:/usr/share/tessdata:rw \\"
+echo "  -v $BASE_DIR/config:/configs:rw \\"
+echo "  -v $BASE_DIR/logs:/logs:rw \\"
+echo "  -v $BASE_DIR/customFiles:/customFiles:rw \\"
+echo "  -v $BASE_DIR/pipeline:/pipeline:rw \\"
+echo "  docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest-fat"
+echo ""
+echo -e "${YELLOW}IMPORTANT:${NC} For rootless mode, always use the ${YELLOW}:latest-fat${NC} image tag"
+echo "which includes all dependencies pre-installed."

settings.gradle

@@ -1 +1,5 @@
+plugins {
+    // Apply the foojay-resolver plugin to allow automatic download of JDKs
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}
 rootProject.name = 'Stirling-PDF'

src/main/java/stirling/software/SPDF/EE/EEAppConfig.java

@@ -7,7 +7,11 @@ import org.springframework.core.annotation.Order;
 
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.EE.KeygenLicenseVerifier.License;
 import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.ApplicationProperties.EnterpriseEdition;
+import stirling.software.SPDF.model.ApplicationProperties.Premium;
+import stirling.software.SPDF.model.ApplicationProperties.Premium.ProFeatures.GoogleDrive;
 
 @Configuration
 @Order(Ordered.HIGHEST_PRECEDENCE)
@@ -22,15 +26,106 @@ public class EEAppConfig {
             ApplicationProperties applicationProperties, LicenseKeyChecker licenseKeyChecker) {
         this.applicationProperties = applicationProperties;
         this.licenseKeyChecker = licenseKeyChecker;
+        migrateEnterpriseSettingsToPremium(this.applicationProperties);
+    }
+
+    @Bean(name = "runningProOrHigher")
+    public boolean runningProOrHigher() {
+        return licenseKeyChecker.getPremiumLicenseEnabledResult() != License.NORMAL;
+    }
+
+    @Bean(name = "license")
+    public String licenseType() {
+        return licenseKeyChecker.getPremiumLicenseEnabledResult().name();
     }
 
     @Bean(name = "runningEE")
-    public boolean runningEnterpriseEdition() {
-        return licenseKeyChecker.getEnterpriseEnabledResult();
+    public boolean runningEnterprise() {
+        return licenseKeyChecker.getPremiumLicenseEnabledResult() == License.ENTERPRISE;
     }
 
     @Bean(name = "SSOAutoLogin")
     public boolean ssoAutoLogin() {
-        return applicationProperties.getEnterpriseEdition().isSsoAutoLogin();
+        return applicationProperties.getPremium().getProFeatures().isSsoAutoLogin();
+    }
+
+    @Bean(name = "GoogleDriveEnabled")
+    public boolean googleDriveEnabled() {
+        return runningProOrHigher()
+                && applicationProperties.getPremium().getProFeatures().getGoogleDrive().isEnabled();
+    }
+
+    @Bean(name = "GoogleDriveConfig")
+    public GoogleDrive googleDriveConfig() {
+        return applicationProperties.getPremium().getProFeatures().getGoogleDrive();
+    }
+
+    // TODO: Remove post migration
+    @SuppressWarnings("deprecation")
+    public void migrateEnterpriseSettingsToPremium(ApplicationProperties applicationProperties) {
+        EnterpriseEdition enterpriseEdition = applicationProperties.getEnterpriseEdition();
+        Premium premium = applicationProperties.getPremium();
+
+        // Only proceed if both objects exist
+        if (enterpriseEdition == null || premium == null) {
+            return;
+        }
+
+        // Copy the license key if it's set in enterprise but not in premium
+        if (premium.getKey() == null
+                || premium.getKey().equals("00000000-0000-0000-0000-000000000000")) {
+            if (enterpriseEdition.getKey() != null
+                    && !enterpriseEdition.getKey().equals("00000000-0000-0000-0000-000000000000")) {
+                premium.setKey(enterpriseEdition.getKey());
+            }
+        }
+
+        // Copy enabled state if enterprise is enabled but premium is not
+        if (!premium.isEnabled() && enterpriseEdition.isEnabled()) {
+            premium.setEnabled(true);
+        }
+
+        // Copy SSO auto login setting
+        if (!premium.getProFeatures().isSsoAutoLogin() && enterpriseEdition.isSsoAutoLogin()) {
+            premium.getProFeatures().setSsoAutoLogin(true);
+        }
+
+        // Copy CustomMetadata settings
+        Premium.ProFeatures.CustomMetadata premiumMetadata =
+                premium.getProFeatures().getCustomMetadata();
+        EnterpriseEdition.CustomMetadata enterpriseMetadata = enterpriseEdition.getCustomMetadata();
+
+        if (enterpriseMetadata != null && premiumMetadata != null) {
+            // Copy autoUpdateMetadata setting
+            if (!premiumMetadata.isAutoUpdateMetadata()
+                    && enterpriseMetadata.isAutoUpdateMetadata()) {
+                premiumMetadata.setAutoUpdateMetadata(true);
+            }
+
+            // Copy author if not set in premium but set in enterprise
+            if ((premiumMetadata.getAuthor() == null
+                            || premiumMetadata.getAuthor().trim().isEmpty()
+                            || "username".equals(premiumMetadata.getAuthor()))
+                    && enterpriseMetadata.getAuthor() != null
+                    && !enterpriseMetadata.getAuthor().trim().isEmpty()) {
+                premiumMetadata.setAuthor(enterpriseMetadata.getAuthor());
+            }
+
+            // Copy creator if not set in premium but set in enterprise and different from default
+            if ((premiumMetadata.getCreator() == null
+                            || "Stirling-PDF".equals(premiumMetadata.getCreator()))
+                    && enterpriseMetadata.getCreator() != null
+                    && !"Stirling-PDF".equals(enterpriseMetadata.getCreator())) {
+                premiumMetadata.setCreator(enterpriseMetadata.getCreator());
+            }
+
+            // Copy producer if not set in premium but set in enterprise and different from default
+            if ((premiumMetadata.getProducer() == null
+                            || "Stirling-PDF".equals(premiumMetadata.getProducer()))
+                    && enterpriseMetadata.getProducer() != null
+                    && !"Stirling-PDF".equals(enterpriseMetadata.getProducer())) {
+                premiumMetadata.setProducer(enterpriseMetadata.getProducer());
+            }
+        }
     }
 }

src/main/java/stirling/software/SPDF/EE/KeygenLicenseVerifier.java

@@ -4,14 +4,19 @@ import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.util.Base64;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
+import org.bouncycastle.crypto.signers.Ed25519Signer;
+import org.bouncycastle.util.encoders.Hex;
 import org.springframework.stereotype.Service;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.posthog.java.shaded.org.json.JSONException;
 import com.posthog.java.shaded.org.json.JSONObject;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -19,42 +24,461 @@ import stirling.software.SPDF.utils.GeneralUtils;
 
 @Service
 @Slf4j
+@RequiredArgsConstructor
 public class KeygenLicenseVerifier {
-    // todo: place in config files?
-    private static final String ACCOUNT_ID = "e5430f69-e834-4ae4-befd-b602aae5f372";
-    private static final String BASE_URL = "https://api.keygen.sh/v1/accounts";
-    private static final ObjectMapper objectMapper = new ObjectMapper();
 
-    private final ApplicationProperties applicationProperties;
-
-    @Autowired
-    public KeygenLicenseVerifier(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
+    enum License {
+        NORMAL,
+        PRO,
+        ENTERPRISE
     }
 
-    public boolean verifyLicense(String licenseKey) {
+    // License verification configuration
+    private static final String ACCOUNT_ID = "e5430f69-e834-4ae4-befd-b602aae5f372";
+    private static final String BASE_URL = "https://api.keygen.sh/v1/accounts";
+
+    private static final String PUBLIC_KEY =
+            "9fbc0d78593dcfcf03c945146edd60083bf5fae77dbc08aaa3935f03ce94a58d";
+
+    private static final String CERT_PREFIX = "-----BEGIN LICENSE FILE-----";
+    private static final String CERT_SUFFIX = "-----END LICENSE FILE-----";
+
+    private static final String JWT_PREFIX = "key/";
+
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+    private final ApplicationProperties applicationProperties;
+
+    // Shared HTTP client for connection pooling
+    private static final HttpClient httpClient =
+            HttpClient.newBuilder()
+                    .version(HttpClient.Version.HTTP_2)
+                    .connectTimeout(java.time.Duration.ofSeconds(10))
+                    .build();
+
+    // License metadata context class to avoid shared mutable state
+    private static class LicenseContext {
+        private boolean isFloatingLicense = false;
+        private int maxMachines = 1; // Default to 1 if not specified
+        private boolean isEnterpriseLicense = false;
+
+        public LicenseContext() {}
+    }
+
+    public License verifyLicense(String licenseKeyOrCert) {
+        License license;
+        LicenseContext context = new LicenseContext();
+
+        if (isCertificateLicense(licenseKeyOrCert)) {
+            log.info("Detected certificate-based license. Processing...");
+            boolean isValid = verifyCertificateLicense(licenseKeyOrCert, context);
+            if (isValid) {
+                license = context.isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
+            } else {
+                license = License.NORMAL;
+            }
+        } else if (isJWTLicense(licenseKeyOrCert)) {
+            log.info("Detected JWT-style license key. Processing...");
+            boolean isValid = verifyJWTLicense(licenseKeyOrCert, context);
+            if (isValid) {
+                license = context.isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
+            } else {
+                license = License.NORMAL;
+            }
+        } else {
+            log.info("Detected standard license key. Processing...");
+            boolean isValid = verifyStandardLicense(licenseKeyOrCert, context);
+            if (isValid) {
+                license = context.isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
+            } else {
+                license = License.NORMAL;
+            }
+        }
+        return license;
+    }
+
+    // Removed instance field for isEnterpriseLicense, now using LicenseContext
+
+    private boolean isCertificateLicense(String license) {
+        return license != null && license.trim().startsWith(CERT_PREFIX);
+    }
+
+    private boolean isJWTLicense(String license) {
+        return license != null && license.trim().startsWith(JWT_PREFIX);
+    }
+
+    private boolean verifyCertificateLicense(String licenseFile, LicenseContext context) {
         try {
-            log.info("Checking license key");
+            String encodedPayload = licenseFile;
+            // Remove the header
+            encodedPayload = encodedPayload.replace(CERT_PREFIX, "");
+            // Remove the footer
+            encodedPayload = encodedPayload.replace(CERT_SUFFIX, "");
+            // Remove all newlines
+            encodedPayload = encodedPayload.replaceAll("\\r?\\n", "");
+
+            byte[] payloadBytes = Base64.getDecoder().decode(encodedPayload);
+            String payload = new String(payloadBytes);
+
+            log.info("Decoded certificate payload: {}", payload);
+
+            String encryptedData = "";
+            String encodedSignature = "";
+            String algorithm = "";
+
+            try {
+                JSONObject attrs = new JSONObject(payload);
+                encryptedData = (String) attrs.get("enc");
+                encodedSignature = (String) attrs.get("sig");
+                algorithm = (String) attrs.get("alg");
+            } catch (JSONException e) {
+                log.error("Failed to parse license file: {}", e.getMessage());
+                return false;
+            }
+
+            // Verify license file algorithm
+            if (!"base64+ed25519".equals(algorithm)) {
+                log.error(
+                        "Unsupported algorithm: {}. Only base64+ed25519 is supported.", algorithm);
+                return false;
+            }
+
+            // Verify signature
+            boolean isSignatureValid = verifyEd25519Signature(encryptedData, encodedSignature);
+            if (!isSignatureValid) {
+                log.error("License file signature is invalid");
+                return false;
+            }
+
+            log.info("License file signature is valid");
+
+            // Decode the base64 data
+            String decodedData;
+            try {
+                decodedData = new String(Base64.getDecoder().decode(encryptedData));
+            } catch (IllegalArgumentException e) {
+                log.error("Failed to decode license data: {}", e.getMessage());
+                return false;
+            }
+
+            // Process the certificate data
+            boolean isValid = processCertificateData(decodedData, context);
+
+            return isValid;
+        } catch (Exception e) {
+            log.error("Error verifying certificate license: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    private boolean verifyEd25519Signature(String encryptedData, String encodedSignature) {
+        try {
+            log.info("Signature to verify: {}", encodedSignature);
+
+            byte[] signatureBytes = Base64.getDecoder().decode(encodedSignature);
+
+            // Create the signing data format - prefix with "license/"
+            String signingData = String.format("license/%s", encryptedData);
+            byte[] signingDataBytes = signingData.getBytes();
+
+            log.info("Signing data length: {} bytes", signingDataBytes.length);
+
+            byte[] publicKeyBytes = Hex.decode(PUBLIC_KEY);
+
+            Ed25519PublicKeyParameters verifierParams =
+                    new Ed25519PublicKeyParameters(publicKeyBytes, 0);
+            Ed25519Signer verifier = new Ed25519Signer();
+
+            verifier.init(false, verifierParams);
+            verifier.update(signingDataBytes, 0, signingDataBytes.length);
+
+            // Verify the signature
+            boolean result = verifier.verifySignature(signatureBytes);
+            if (!result) {
+                log.error("Signature verification failed with standard public key");
+            }
+
+            return result;
+        } catch (Exception e) {
+            log.error("Error verifying Ed25519 signature: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    private boolean processCertificateData(String certData, LicenseContext context) {
+        try {
+            JSONObject licenseData = new JSONObject(certData);
+            JSONObject metaObj = licenseData.optJSONObject("meta");
+            if (metaObj != null) {
+                String issuedStr = metaObj.optString("issued", null);
+                String expiryStr = metaObj.optString("expiry", null);
+
+                if (issuedStr != null && expiryStr != null) {
+                    java.time.Instant issued = java.time.Instant.parse(issuedStr);
+                    java.time.Instant expiry = java.time.Instant.parse(expiryStr);
+                    java.time.Instant now = java.time.Instant.now();
+
+                    if (issued.isAfter(now)) {
+                        log.error(
+                                "License file issued date is in the future. Please adjust system"
+                                        + " time or request a new license");
+                        return false;
+                    }
+
+                    // Check if the license file has expired
+                    if (expiry.isBefore(now)) {
+                        log.error("License file has expired on {}", expiryStr);
+                        return false;
+                    }
+
+                    log.info("License file valid until {}", expiryStr);
+                }
+            }
+
+            // Get the main license data
+            JSONObject dataObj = licenseData.optJSONObject("data");
+            if (dataObj == null) {
+                log.error("No data object found in certificate");
+                return false;
+            }
+
+            // Extract license or machine information
+            JSONObject attributesObj = dataObj.optJSONObject("attributes");
+            if (attributesObj != null) {
+                log.info("Found attributes in certificate data");
+
+                // Check for floating license
+                context.isFloatingLicense = attributesObj.optBoolean("floating", false);
+                context.maxMachines = attributesObj.optInt("maxMachines", 1);
+
+                // Extract metadata
+                JSONObject metadataObj = attributesObj.optJSONObject("metadata");
+                if (metadataObj != null) {
+                    int users = metadataObj.optInt("users", 1);
+                    applicationProperties.getPremium().setMaxUsers(users);
+                    log.info("License allows for {} users", users);
+                    context.isEnterpriseLicense = metadataObj.optBoolean("isEnterprise", false);
+                }
+
+                // Check license status if available
+                String status = attributesObj.optString("status", null);
+                if (status != null
+                        && !"ACTIVE".equals(status)
+                        && !"EXPIRING".equals(status)) { // Accept "EXPIRING" status as valid
+                    log.error("License status is not active: {}", status);
+                    return false;
+                }
+            }
+
+            return true;
+        } catch (Exception e) {
+            log.error("Error processing certificate data: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    private boolean verifyJWTLicense(String licenseKey, LicenseContext context) {
+        try {
+            log.info("Verifying ED25519_SIGN format license key");
+
+            // Remove the "key/" prefix
+            String licenseData = licenseKey.substring(JWT_PREFIX.length());
+
+            // Split into payload and signature
+            String[] parts = licenseData.split("\\.", 2);
+            if (parts.length != 2) {
+                log.error(
+                        "Invalid ED25519_SIGN license format. Expected format:"
+                                + " key/payload.signature");
+                return false;
+            }
+
+            String encodedPayload = parts[0];
+            String encodedSignature = parts[1];
+
+            // Verify signature
+            boolean isSignatureValid = verifyJWTSignature(encodedPayload, encodedSignature);
+            if (!isSignatureValid) {
+                log.error("ED25519_SIGN license signature is invalid");
+                return false;
+            }
+
+            log.info("ED25519_SIGN license signature is valid");
+
+            // Decode and process payload - first convert from URL-safe base64 if needed
+            String base64Payload = encodedPayload.replace('-', '+').replace('_', '/');
+            byte[] payloadBytes = Base64.getDecoder().decode(base64Payload);
+            String payload = new String(payloadBytes);
+
+            // Process the license payload
+            boolean isValid = processJWTLicensePayload(payload, context);
+
+            return isValid;
+        } catch (Exception e) {
+            log.error("Error verifying ED25519_SIGN license: {}", e.getMessage());
+            return false;
+        }
+    }
+
+    private boolean verifyJWTSignature(String encodedPayload, String encodedSignature) {
+        try {
+            // Decode base64 signature
+            byte[] signatureBytes =
+                    Base64.getDecoder()
+                            .decode(encodedSignature.replace('-', '+').replace('_', '/'));
+
+            // For ED25519_SIGN format, the signing data is "key/" + encodedPayload
+            String signingData = String.format("key/%s", encodedPayload);
+            byte[] dataBytes = signingData.getBytes();
+
+            byte[] publicKeyBytes = Hex.decode(PUBLIC_KEY);
+            Ed25519PublicKeyParameters verifierParams =
+                    new Ed25519PublicKeyParameters(publicKeyBytes, 0);
+            Ed25519Signer verifier = new Ed25519Signer();
+
+            verifier.init(false, verifierParams);
+            verifier.update(dataBytes, 0, dataBytes.length);
+
+            // Verify the signature
+            return verifier.verifySignature(signatureBytes);
+        } catch (Exception e) {
+            log.error("Error verifying JWT signature: {}", e.getMessage());
+            return false;
+        }
+    }
+
+    private boolean processJWTLicensePayload(String payload, LicenseContext context) {
+        try {
+            log.info("Processing license payload: {}", payload);
+
+            JSONObject licenseData = new JSONObject(payload);
+
+            JSONObject licenseObj = licenseData.optJSONObject("license");
+            if (licenseObj == null) {
+                String id = licenseData.optString("id", null);
+                if (id != null) {
+                    log.info("Found license ID: {}", id);
+                    licenseObj = licenseData; // Use the root object as the license object
+                } else {
+                    log.error("License data not found in payload");
+                    return false;
+                }
+            }
+
+            String licenseId = licenseObj.optString("id", "unknown");
+            log.info("Processing license with ID: {}", licenseId);
+
+            // Check for floating license in license object
+            context.isFloatingLicense = licenseObj.optBoolean("floating", false);
+            context.maxMachines = licenseObj.optInt("maxMachines", 1);
+            if (context.isFloatingLicense) {
+                log.info("Detected floating license with max machines: {}", context.maxMachines);
+            }
+
+            // Check expiry date
+            String expiryStr = licenseObj.optString("expiry", null);
+            if (expiryStr != null && !"null".equals(expiryStr)) {
+                java.time.Instant expiry = java.time.Instant.parse(expiryStr);
+                java.time.Instant now = java.time.Instant.now();
+
+                if (now.isAfter(expiry)) {
+                    log.error("License has expired on {}", expiryStr);
+                    return false;
+                }
+
+                log.info("License valid until {}", expiryStr);
+            } else {
+                log.info("License has no expiration date");
+            }
+
+            // Extract account, product, policy info
+            JSONObject accountObj = licenseData.optJSONObject("account");
+            if (accountObj != null) {
+                String accountId = accountObj.optString("id", "unknown");
+                log.info("License belongs to account: {}", accountId);
+
+                // Verify this matches your expected account ID
+                if (!ACCOUNT_ID.equals(accountId)) {
+                    log.warn("License account ID does not match expected account ID");
+                    // You might want to fail verification here depending on your requirements
+                }
+            }
+
+            // Extract policy information if available
+            JSONObject policyObj = licenseData.optJSONObject("policy");
+            if (policyObj != null) {
+                String policyId = policyObj.optString("id", "unknown");
+                log.info("License uses policy: {}", policyId);
+
+                // Check for floating license in policy
+                boolean policyFloating = policyObj.optBoolean("floating", false);
+                int policyMaxMachines = policyObj.optInt("maxMachines", 1);
+
+                // Policy settings take precedence
+                if (policyFloating) {
+                    context.isFloatingLicense = true;
+                    context.maxMachines = policyMaxMachines;
+                    log.info(
+                            "Policy defines floating license with max machines: {}",
+                            context.maxMachines);
+                }
+
+                // Extract max users and isEnterprise from policy or metadata
+                int users = policyObj.optInt("users", 1);
+                context.isEnterpriseLicense = policyObj.optBoolean("isEnterprise", false);
+
+                if (users > 0) {
+                    applicationProperties.getPremium().setMaxUsers(users);
+                    log.info("License allows for {} users", users);
+                } else {
+                    // Try to get users from metadata if present
+                    Object metadataObj = policyObj.opt("metadata");
+                    if (metadataObj instanceof JSONObject metadata) {
+                        users = metadata.optInt("users", 1);
+                        applicationProperties.getPremium().setMaxUsers(users);
+                        log.info("License allows for {} users (from metadata)", users);
+
+                        // Check for isEnterprise flag in metadata
+                        context.isEnterpriseLicense = metadata.optBoolean("isEnterprise", false);
+                    } else {
+                        // Default value
+                        applicationProperties.getPremium().setMaxUsers(1);
+                        log.info("Using default of 1 user for license");
+                    }
+                }
+            }
+
+            return true;
+        } catch (Exception e) {
+            log.error("Error processing license payload: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    private boolean verifyStandardLicense(String licenseKey, LicenseContext context) {
+        try {
+            log.info("Checking standard license key");
             String machineFingerprint = generateMachineFingerprint();
 
             // First, try to validate the license
-            JsonNode validationResponse = validateLicense(licenseKey, machineFingerprint);
+            JsonNode validationResponse = validateLicense(licenseKey, machineFingerprint, context);
             if (validationResponse != null) {
                 boolean isValid = validationResponse.path("meta").path("valid").asBoolean();
                 String licenseId = validationResponse.path("data").path("id").asText();
                 if (!isValid) {
                     String code = validationResponse.path("meta").path("code").asText();
-                    log.debug(code);
+                    log.info(code);
                     if ("NO_MACHINE".equals(code)
                             || "NO_MACHINES".equals(code)
                             || "FINGERPRINT_SCOPE_MISMATCH".equals(code)) {
                         log.info(
-                                "License not activated for this machine. Attempting to activate...");
+                                "License not activated for this machine. Attempting to"
+                                        + " activate...");
                         boolean activated =
-                                activateMachine(licenseKey, licenseId, machineFingerprint);
+                                activateMachine(licenseKey, licenseId, machineFingerprint, context);
                         if (activated) {
                             // Revalidate after activation
-                            validationResponse = validateLicense(licenseKey, machineFingerprint);
+                            validationResponse =
+                                    validateLicense(licenseKey, machineFingerprint, context);
                             isValid =
                                     validationResponse != null
                                             && validationResponse
@@ -69,14 +493,13 @@ public class KeygenLicenseVerifier {
 
             return false;
         } catch (Exception e) {
-            log.error("Error verifying license: {}", e.getMessage());
+            log.error("Error verifying standard license: {}", e.getMessage());
             return false;
         }
     }
 
-    private JsonNode validateLicense(String licenseKey, String machineFingerprint)
-            throws Exception {
-        HttpClient client = HttpClient.newHttpClient();
+    private JsonNode validateLicense(
+            String licenseKey, String machineFingerprint, LicenseContext context) throws Exception {
         String requestBody =
                 String.format(
                         "{\"meta\":{\"key\":\"%s\",\"scope\":{\"fingerprint\":\"%s\"}}}",
@@ -95,8 +518,9 @@ public class KeygenLicenseVerifier {
                         .POST(HttpRequest.BodyPublishers.ofString(requestBody))
                         .build();
 
-        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-        log.debug("ValidateLicenseResponse body: {}", response.body());
+        HttpResponse<String> response =
+                httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        log.info("ValidateLicenseResponse body: {}", response.body());
         JsonNode jsonResponse = objectMapper.readTree(response.body());
         if (response.statusCode() == 200) {
             JsonNode metaNode = jsonResponse.path("meta");
@@ -105,18 +529,72 @@ public class KeygenLicenseVerifier {
             String detail = metaNode.path("detail").asText();
             String code = metaNode.path("code").asText();
 
-            log.debug("License validity: " + isValid);
-            log.debug("Validation detail: " + detail);
-            log.debug("Validation code: " + code);
+            log.info("License validity: " + isValid);
+            log.info("Validation detail: " + detail);
+            log.info("Validation code: " + code);
 
+            // Check if the license itself has floating attribute
+            JsonNode licenseAttrs = jsonResponse.path("data").path("attributes");
+            if (!licenseAttrs.isMissingNode()) {
+                context.isFloatingLicense = licenseAttrs.path("floating").asBoolean(false);
+                context.maxMachines = licenseAttrs.path("maxMachines").asInt(1);
+
+                log.info(
+                        "License floating (from license): {}, maxMachines: {}",
+                        context.isFloatingLicense,
+                        context.maxMachines);
+            }
+
+            // Also check the policy for floating license support if included
+            JsonNode includedNode = jsonResponse.path("included");
+            JsonNode policyNode = null;
+
+            if (includedNode.isArray()) {
+                for (JsonNode node : includedNode) {
+                    if ("policies".equals(node.path("type").asText())) {
+                        policyNode = node;
+                        break;
+                    }
+                }
+            }
+
+            if (policyNode != null) {
+                // Check if this is a floating license from policy
+                boolean policyFloating =
+                        policyNode.path("attributes").path("floating").asBoolean(false);
+                int policyMaxMachines = policyNode.path("attributes").path("maxMachines").asInt(1);
+
+                // Policy takes precedence over license attributes
+                if (policyFloating) {
+                    context.isFloatingLicense = true;
+                    context.maxMachines = policyMaxMachines;
+                }
+
+                log.info(
+                        "License floating (from policy): {}, maxMachines: {}",
+                        context.isFloatingLicense,
+                        context.maxMachines);
+            }
+
+            // Extract user count, default to 1 if not specified
             int users =
                     jsonResponse
                             .path("data")
                             .path("attributes")
                             .path("metadata")
                             .path("users")
-                            .asInt(0);
-            applicationProperties.getEnterpriseEdition().setMaxUsers(users);
+                            .asInt(1);
+            applicationProperties.getPremium().setMaxUsers(users);
+
+            // Extract isEnterprise flag
+            context.isEnterpriseLicense =
+                    jsonResponse
+                            .path("data")
+                            .path("attributes")
+                            .path("metadata")
+                            .path("isEnterprise")
+                            .asBoolean(false);
+
             log.info(applicationProperties.toString());
 
         } else {
@@ -125,10 +603,105 @@ public class KeygenLicenseVerifier {
         return jsonResponse;
     }
 
-    private boolean activateMachine(String licenseKey, String licenseId, String machineFingerprint)
+    private boolean activateMachine(
+            String licenseKey, String licenseId, String machineFingerprint, LicenseContext context)
             throws Exception {
-        HttpClient client = HttpClient.newHttpClient();
+        // For floating licenses, we first need to check if we need to deregister any machines
+        if (context.isFloatingLicense) {
+            log.info(
+                    "Processing floating license activation. Max machines allowed: {}",
+                    context.maxMachines);
 
+            // Get the current machines for this license
+            JsonNode machinesResponse = fetchMachinesForLicense(licenseKey, licenseId);
+            if (machinesResponse != null) {
+                JsonNode machines = machinesResponse.path("data");
+                int currentMachines = machines.size();
+
+                log.info(
+                        "Current machine count: {}, Max allowed: {}",
+                        currentMachines,
+                        context.maxMachines);
+
+                // Check if the current fingerprint is already activated
+                boolean isCurrentMachineActivated = false;
+                String currentMachineId = null;
+
+                for (JsonNode machine : machines) {
+                    if (machineFingerprint.equals(
+                            machine.path("attributes").path("fingerprint").asText())) {
+                        isCurrentMachineActivated = true;
+                        currentMachineId = machine.path("id").asText();
+                        log.info(
+                                "Current machine is already activated with ID: {}",
+                                currentMachineId);
+                        break;
+                    }
+                }
+
+                // If the current machine is already activated, there's no need to do anything
+                if (isCurrentMachineActivated) {
+                    log.info("Machine already activated. No action needed.");
+                    return true;
+                }
+
+                // If we've reached the max machines limit, we need to deregister the oldest machine
+                if (currentMachines >= context.maxMachines) {
+                    log.info(
+                            "Max machines reached. Deregistering oldest machine to make room for the new machine.");
+
+                    // Find the oldest machine based on creation timestamp
+                    if (machines.size() > 0) {
+                        // Find the machine with the oldest creation date
+                        String oldestMachineId = null;
+                        java.time.Instant oldestTime = null;
+
+                        for (JsonNode machine : machines) {
+                            String createdStr =
+                                    machine.path("attributes").path("created").asText(null);
+                            if (createdStr != null && !createdStr.isEmpty()) {
+                                try {
+                                    java.time.Instant createdTime =
+                                            java.time.Instant.parse(createdStr);
+                                    if (oldestTime == null || createdTime.isBefore(oldestTime)) {
+                                        oldestTime = createdTime;
+                                        oldestMachineId = machine.path("id").asText();
+                                    }
+                                } catch (Exception e) {
+                                    log.warn(
+                                            "Could not parse creation time for machine: {}",
+                                            e.getMessage());
+                                }
+                            }
+                        }
+
+                        // If we couldn't determine the oldest by timestamp, use the first one
+                        if (oldestMachineId == null) {
+                            log.warn(
+                                    "Could not determine oldest machine by timestamp, using first machine in list");
+                            oldestMachineId = machines.path(0).path("id").asText();
+                        }
+
+                        log.info("Deregistering machine with ID: {}", oldestMachineId);
+
+                        boolean deregistered = deregisterMachine(licenseKey, oldestMachineId);
+                        if (!deregistered) {
+                            log.error(
+                                    "Failed to deregister machine. Cannot proceed with activation.");
+                            return false;
+                        }
+                        log.info(
+                                "Machine deregistered successfully. Proceeding with activation of new machine.");
+                    } else {
+                        log.error(
+                                "License has reached machine limit but no machines were found to deregister. This is unexpected.");
+                        // We'll still try to activate, but it might fail
+                    }
+                }
+            }
+        }
+
+        // Proceed with machine activation
         String hostname;
         try {
             hostname = java.net.InetAddress.getLocalHost().getHostName();
@@ -148,13 +721,8 @@ public class KeygenLicenseVerifier {
                                                         .put("fingerprint", machineFingerprint)
                                                         .put(
                                                                 "platform",
-                                                                System.getProperty(
-                                                                        "os.name")) // Added
-                                                        // platform
-                                                        // parameter
-                                                        .put(
-                                                                "name",
-                                                                hostname)) // Added name parameter
+                                                                System.getProperty("os.name"))
+                                                        .put("name", hostname))
                                         .put(
                                                 "relationships",
                                                 new JSONObject()
@@ -176,16 +744,13 @@ public class KeygenLicenseVerifier {
                         .uri(URI.create(BASE_URL + "/" + ACCOUNT_ID + "/machines"))
                         .header("Content-Type", "application/vnd.api+json")
                         .header("Accept", "application/vnd.api+json")
-                        .header(
-                                "Authorization",
-                                "License " + licenseKey) // Keep the license key authentication
-                        .POST(
-                                HttpRequest.BodyPublishers.ofString(
-                                        body.toString())) // Send the JSON body
+                        .header("Authorization", "License " + licenseKey)
+                        .POST(HttpRequest.BodyPublishers.ofString(body.toString()))
                         .build();
 
-        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-        log.debug("activateMachine Response body: " + response.body());
+        HttpResponse<String> response =
+                httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        log.info("activateMachine Response body: " + response.body());
         if (response.statusCode() == 201) {
             log.info("Machine activated successfully");
             return true;
@@ -202,4 +767,81 @@ public class KeygenLicenseVerifier {
     private String generateMachineFingerprint() {
         return GeneralUtils.generateMachineFingerprint();
     }
+
+    /**
+     * Fetches all machines associated with a specific license
+     *
+     * @param licenseKey The license key to check
+     * @param licenseId The license ID
+     * @return JsonNode containing the list of machines, or null if an error occurs
+     * @throws Exception if an error occurs during the HTTP request
+     */
+    private JsonNode fetchMachinesForLicense(String licenseKey, String licenseId) throws Exception {
+        HttpRequest request =
+                HttpRequest.newBuilder()
+                        .uri(
+                                URI.create(
+                                        BASE_URL
+                                                + "/"
+                                                + ACCOUNT_ID
+                                                + "/licenses/"
+                                                + licenseId
+                                                + "/machines"))
+                        .header("Content-Type", "application/vnd.api+json")
+                        .header("Accept", "application/vnd.api+json")
+                        .header("Authorization", "License " + licenseKey)
+                        .GET()
+                        .build();
+
+        HttpResponse<String> response =
+                httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        log.info("fetchMachinesForLicense Response body: {}", response.body());
+
+        if (response.statusCode() == 200) {
+            return objectMapper.readTree(response.body());
+        } else {
+            log.error(
+                    "Error fetching machines for license. Status code: {}, error: {}",
+                    response.statusCode(),
+                    response.body());
+            return null;
+        }
+    }
+
+    /**
+     * Deregisters a machine from a license
+     *
+     * @param licenseKey The license key
+     * @param machineId The ID of the machine to deregister
+     * @return true if deregistration was successful, false otherwise
+     */
+    private boolean deregisterMachine(String licenseKey, String machineId) {
+        try {
+            HttpRequest request =
+                    HttpRequest.newBuilder()
+                            .uri(URI.create(BASE_URL + "/" + ACCOUNT_ID + "/machines/" + machineId))
+                            .header("Content-Type", "application/vnd.api+json")
+                            .header("Accept", "application/vnd.api+json")
+                            .header("Authorization", "License " + licenseKey)
+                            .DELETE()
+                            .build();
+
+            HttpResponse<String> response =
+                    httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+            if (response.statusCode() == 204) {
+                log.info("Machine {} successfully deregistered", machineId);
+                return true;
+            } else {
+                log.error(
+                        "Error deregistering machine. Status code: {}, error: {}",
+                        response.statusCode(),
+                        response.body());
+                return false;
+            }
+        } catch (Exception e) {
+            log.error("Exception during machine deregistration: {}", e.getMessage(), e);
+            return false;
+        }
+    }
 }

src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java

@@ -1,13 +1,16 @@
 package stirling.software.SPDF.EE;
 
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.EE.KeygenLicenseVerifier.License;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.utils.GeneralUtils;
 
@@ -15,13 +18,14 @@ import stirling.software.SPDF.utils.GeneralUtils;
 @Slf4j
 public class LicenseKeyChecker {
 
+    private static final String FILE_PREFIX = "file:";
+
     private final KeygenLicenseVerifier licenseService;
 
     private final ApplicationProperties applicationProperties;
 
-    private boolean enterpriseEnabledResult = false;
+    private License premiumEnabledResult = License.NORMAL;
 
-    @Autowired
     public LicenseKeyChecker(
             KeygenLicenseVerifier licenseService, ApplicationProperties applicationProperties) {
         this.licenseService = licenseService;
@@ -35,27 +39,60 @@ public class LicenseKeyChecker {
     }
 
     private void checkLicense() {
-        if (!applicationProperties.getEnterpriseEdition().isEnabled()) {
-            enterpriseEnabledResult = false;
+        if (!applicationProperties.getPremium().isEnabled()) {
+            premiumEnabledResult = License.NORMAL;
         } else {
-            enterpriseEnabledResult =
-                    licenseService.verifyLicense(
-                            applicationProperties.getEnterpriseEdition().getKey());
-            if (enterpriseEnabledResult) {
-                log.info("License key is valid.");
+            String licenseKey = getLicenseKeyContent(applicationProperties.getPremium().getKey());
+            if (licenseKey != null) {
+                premiumEnabledResult = licenseService.verifyLicense(licenseKey);
+                if (License.ENTERPRISE == premiumEnabledResult) {
+                    log.info("License key is Enterprise.");
+                } else if (License.PRO == premiumEnabledResult) {
+                    log.info("License key is Pro.");
+                } else {
+                    log.info("License key is invalid, defaulting to non pro license.");
+                }
             } else {
-                log.info("License key is invalid.");
+                log.error("Failed to obtain license key content.");
+                premiumEnabledResult = License.NORMAL;
             }
         }
     }
 
+    private String getLicenseKeyContent(String keyOrFilePath) {
+        if (keyOrFilePath == null || keyOrFilePath.trim().isEmpty()) {
+            log.error("License key is not specified");
+            return null;
+        }
+
+        // Check if it's a file reference
+        if (keyOrFilePath.startsWith(FILE_PREFIX)) {
+            String filePath = keyOrFilePath.substring(FILE_PREFIX.length());
+            try {
+                Path path = Paths.get(filePath);
+                if (!Files.exists(path)) {
+                    log.error("License file does not exist: {}", filePath);
+                    return null;
+                }
+                log.info("Reading license from file: {}", filePath);
+                return Files.readString(path);
+            } catch (IOException e) {
+                log.error("Failed to read license file: {}", e.getMessage());
+                return null;
+            }
+        }
+
+        // It's a direct license key
+        return keyOrFilePath;
+    }
+
     public void updateLicenseKey(String newKey) throws IOException {
-        applicationProperties.getEnterpriseEdition().setKey(newKey);
+        applicationProperties.getPremium().setKey(newKey);
         GeneralUtils.saveKeyToSettings("EnterpriseEdition.key", newKey);
         checkLicense();
     }
 
-    public boolean getEnterpriseEnabledResult() {
-        return enterpriseEnabledResult;
+    public License getPremiumLicenseEnabledResult() {
+        return premiumEnabledResult;
     }
 }

src/main/java/stirling/software/SPDF/LibreOfficeListener.java

@@ -31,7 +31,8 @@ public class LibreOfficeListener {
         log.info("waiting for listener to start");
         try (Socket socket = new Socket()) {
             socket.connect(
-                    new InetSocketAddress("localhost", 2002), 1000); // Timeout after 1 second
+                    new InetSocketAddress("localhost", LISTENER_PORT),
+                    1000); // Timeout after 1 second
             return true;
         } catch (Exception e) {
             return false;

src/main/java/stirling/software/SPDF/SPDFApplication.java

@@ -37,6 +37,7 @@ public class SPDFApplication {
 
     private static String serverPortStatic;
     private static String baseUrlStatic;
+    private static String contextPathStatic;
 
     private final Environment env;
     private final ApplicationProperties applicationProperties;
@@ -45,6 +46,9 @@ public class SPDFApplication {
     @Value("${baseUrl:http://localhost}")
     private String baseUrl;
 
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
     public SPDFApplication(
             Environment env,
             ApplicationProperties applicationProperties,
@@ -138,7 +142,8 @@ public class SPDFApplication {
     @PostConstruct
     public void init() {
         baseUrlStatic = this.baseUrl;
-        String url = baseUrl + ":" + getStaticPort();
+        contextPathStatic = this.contextPath;
+        String url = baseUrl + ":" + getStaticPort() + contextPath;
         if (webBrowser != null
                 && Boolean.parseBoolean(System.getProperty("STIRLING_PDF_DESKTOP_UI", "false"))) {
             webBrowser.initWebUI(url);
@@ -195,7 +200,7 @@ public class SPDFApplication {
 
     private static void printStartupLogs() {
         log.info("Stirling-PDF Started.");
-        String url = baseUrlStatic + ":" + getStaticPort();
+        String url = baseUrlStatic + ":" + getStaticPort() + contextPathStatic;
         log.info("Navigate to {}", url);
     }
 
@@ -220,4 +225,8 @@ public class SPDFApplication {
     public static String getStaticPort() {
         return serverPortStatic;
     }
+
+    public static String getStaticContextPath() {
+        return contextPathStatic;
+    }
 }

src/main/java/stirling/software/SPDF/config/AppConfig.java

@@ -5,20 +5,24 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Locale;
 import java.util.Properties;
 import java.util.function.Predicate;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
+import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.spring6.SpringTemplateEngine;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -26,13 +30,12 @@ import stirling.software.SPDF.model.ApplicationProperties;
 @Configuration
 @Lazy
 @Slf4j
+@RequiredArgsConstructor
 public class AppConfig {
 
     private final ApplicationProperties applicationProperties;
 
-    public AppConfig(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
+    private final Environment env;
 
     @Bean
     @ConditionalOnProperty(name = "system.customHTMLFiles", havingValue = "true")
@@ -78,6 +81,11 @@ public class AppConfig {
         return applicationProperties.getUi().getLanguages();
     }
 
+    @Bean
+    public String contextPath(@Value("${server.servlet.context-path}") String contextPath) {
+        return contextPath;
+    }
+
     @Bean(name = "navBarText")
     public String navBarText() {
         String defaultNavBar =
@@ -176,7 +184,7 @@ public class AppConfig {
     @Bean(name = "analyticsEnabled")
     @Scope("request")
     public boolean analyticsEnabled() {
-        if (applicationProperties.getEnterpriseEdition().isEnabled()) return true;
+        if (applicationProperties.getPremium().isEnabled()) return true;
         return applicationProperties.getSystem().isAnalyticsEnabled();
     }
 
@@ -189,4 +197,37 @@ public class AppConfig {
     public String uuid() {
         return applicationProperties.getAutomaticallyGenerated().getUUID();
     }
+
+    @Bean(name = "disablePixel")
+    public boolean disablePixel() {
+        return Boolean.getBoolean(env.getProperty("DISABLE_PIXEL"));
+    }
+
+    @Bean(name = "machineType")
+    public String determineMachineType() {
+        try {
+            boolean isDocker = runningInDocker();
+            boolean isKubernetes = System.getenv("KUBERNETES_SERVICE_HOST") != null;
+            boolean isBrowserOpen = "true".equalsIgnoreCase(env.getProperty("BROWSER_OPEN"));
+
+            if (isKubernetes) {
+                return "Kubernetes";
+            } else if (isDocker) {
+                return "Docker";
+            } else if (isBrowserOpen) {
+                String os = System.getProperty("os.name").toLowerCase(Locale.ROOT);
+                if (os.contains("win")) {
+                    return "Client-windows";
+                } else if (os.contains("mac")) {
+                    return "Client-mac";
+                } else {
+                    return "Client-unix";
+                }
+            } else {
+                return "Server-jar";
+            }
+        } catch (Exception e) {
+            return "Unknown";
+        }
+    }
 }

src/main/java/stirling/software/SPDF/config/ConfigInitializer.java

@@ -9,6 +9,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.util.List;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -56,6 +57,8 @@ public class ConfigInitializer {
             YamlHelper settingsTemplateFile = new YamlHelper(tempTemplatePath);
             YamlHelper settingsFile = new YamlHelper(settingTempPath);
 
+            migrateEnterpriseEditionToPremium(settingsFile, settingsTemplateFile);
+
             boolean changesMade =
                     settingsTemplateFile.updateValuesFromYaml(settingsFile, settingsTemplateFile);
             if (changesMade) {
@@ -76,4 +79,46 @@ public class ConfigInitializer {
             log.info("Created custom_settings file: {}", customSettingsPath.toString());
         }
     }
+
+    // TODO: Remove post migration
+    private void migrateEnterpriseEditionToPremium(YamlHelper yaml, YamlHelper template) {
+        if (yaml.getValueByExactKeyPath("enterpriseEdition", "enabled") != null) {
+            template.updateValue(
+                    List.of("premium", "enabled"),
+                    yaml.getValueByExactKeyPath("enterpriseEdition", "enabled"));
+        }
+        if (yaml.getValueByExactKeyPath("enterpriseEdition", "key") != null) {
+            template.updateValue(
+                    List.of("premium", "key"),
+                    yaml.getValueByExactKeyPath("enterpriseEdition", "key"));
+        }
+        if (yaml.getValueByExactKeyPath("enterpriseEdition", "SSOAutoLogin") != null) {
+            template.updateValue(
+                    List.of("premium", "proFeatures", "SSOAutoLogin"),
+                    yaml.getValueByExactKeyPath("enterpriseEdition", "SSOAutoLogin"));
+        }
+        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "autoUpdateMetadata")
+                != null) {
+            template.updateValue(
+                    List.of("premium", "proFeatures", "CustomMetadata", "autoUpdateMetadata"),
+                    yaml.getValueByExactKeyPath(
+                            "enterpriseEdition", "CustomMetadata", "autoUpdateMetadata"));
+        }
+        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "author") != null) {
+            template.updateValue(
+                    List.of("premium", "proFeatures", "CustomMetadata", "author"),
+                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "author"));
+        }
+        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "creator") != null) {
+            template.updateValue(
+                    List.of("premium", "proFeatures", "CustomMetadata", "creator"),
+                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "creator"));
+        }
+        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "producer")
+                != null) {
+            template.updateValue(
+                    List.of("premium", "proFeatures", "CustomMetadata", "producer"),
+                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "producer"));
+        }
+    }
 }

src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -5,9 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import lombok.extern.slf4j.Slf4j;
@@ -22,10 +21,13 @@ public class EndpointConfiguration {
     private final ApplicationProperties applicationProperties;
     private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
     private Map<String, Set<String>> endpointGroups = new ConcurrentHashMap<>();
+    private final boolean runningProOrHigher;
 
-    @Autowired
-    public EndpointConfiguration(ApplicationProperties applicationProperties) {
+    public EndpointConfiguration(
+            ApplicationProperties applicationProperties,
+            @Qualifier("runningProOrHigher") boolean runningProOrHigher) {
         this.applicationProperties = applicationProperties;
+        this.runningProOrHigher = runningProOrHigher;
         init();
         processEnvironmentConfigs();
     }
@@ -41,6 +43,10 @@ public class EndpointConfiguration {
         }
     }
 
+    public Map<String, Boolean> getEndpointStatuses() {
+        return endpointStatuses;
+    }
+
     public boolean isEndpointEnabled(String endpoint) {
         if (endpoint.startsWith("/")) {
             endpoint = endpoint.substring(1);
@@ -48,6 +54,22 @@ public class EndpointConfiguration {
         return endpointStatuses.getOrDefault(endpoint, true);
     }
 
+    public boolean isGroupEnabled(String group) {
+        Set<String> endpoints = endpointGroups.get(group);
+        if (endpoints == null || endpoints.isEmpty()) {
+            log.debug("Group '{}' does not exist or has no endpoints", group);
+            return false;
+        }
+
+        for (String endpoint : endpoints) {
+            if (!isEndpointEnabled(endpoint)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     public void addEndpointToGroup(String group, String endpoint) {
         endpointGroups.computeIfAbsent(group, k -> new HashSet<>()).add(endpoint);
     }
@@ -77,7 +99,7 @@ public class EndpointConfiguration {
                         // is false)
                         .map(Map.Entry::getKey)
                         .sorted()
-                        .collect(Collectors.toList());
+                        .toList();
 
         if (!disabledList.isEmpty()) {
             log.info(
@@ -142,6 +164,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Other", "sign");
         addEndpointToGroup("Other", "flatten");
         addEndpointToGroup("Other", "repair");
+        addEndpointToGroup("Other", "unlock-pdf-forms");
         addEndpointToGroup("Other", REMOVE_BLANKS);
         addEndpointToGroup("Other", "remove-annotations");
         addEndpointToGroup("Other", "compare");
@@ -176,21 +199,17 @@ public class EndpointConfiguration {
         addEndpointToGroup("OpenCV", "extract-image-scans");
 
         // LibreOffice
-        addEndpointToGroup("qpdf", "repair");
         addEndpointToGroup("LibreOffice", "file-to-pdf");
         addEndpointToGroup("LibreOffice", "pdf-to-word");
         addEndpointToGroup("LibreOffice", "pdf-to-presentation");
         addEndpointToGroup("LibreOffice", "pdf-to-rtf");
         addEndpointToGroup("LibreOffice", "pdf-to-html");
         addEndpointToGroup("LibreOffice", "pdf-to-xml");
+        addEndpointToGroup("LibreOffice", "pdf-to-pdfa");
 
         // Unoconvert
         addEndpointToGroup("Unoconvert", "file-to-pdf");
 
-        // qpdf
-        addEndpointToGroup("qpdf", "compress-pdf");
-        addEndpointToGroup("qpdf", "pdf-to-pdfa");
-
         addEndpointToGroup("tesseract", "ocr-pdf");
 
         // Java
@@ -240,8 +259,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Javascript", "adjust-contrast");
 
         // qpdf dependent endpoints
-        addEndpointToGroup("qpdf", "compress-pdf");
-        addEndpointToGroup("qpdf", "pdf-to-pdfa");
         addEndpointToGroup("qpdf", "repair");
 
         // Weasyprint dependent endpoints
@@ -271,6 +288,13 @@ public class EndpointConfiguration {
                 }
             }
         }
+        if (!runningProOrHigher) {
+            disableGroup("enterprise");
+        }
+
+        if (!applicationProperties.getSystem().getEnableUrlToPDF()) {
+            disableEndpoint("url-to-pdf");
+        }
     }
 
     public Set<String> getEndpointsForGroup(String group) {

src/main/java/stirling/software/SPDF/config/EndpointInspector.java

@@ -0,0 +1,212 @@
+package stirling.software.SPDF.config;
+
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class EndpointInspector implements ApplicationListener<ContextRefreshedEvent> {
+    private static final Logger logger = LoggerFactory.getLogger(EndpointInspector.class);
+
+    private final ApplicationContext applicationContext;
+    private final Set<String> validGetEndpoints = new HashSet<>();
+    private boolean endpointsDiscovered = false;
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        if (!endpointsDiscovered) {
+            discoverEndpoints();
+            endpointsDiscovered = true;
+        }
+    }
+
+    private void discoverEndpoints() {
+        try {
+            Map<String, RequestMappingHandlerMapping> mappings =
+                    applicationContext.getBeansOfType(RequestMappingHandlerMapping.class);
+
+            for (Map.Entry<String, RequestMappingHandlerMapping> entry : mappings.entrySet()) {
+                RequestMappingHandlerMapping mapping = entry.getValue();
+                Map<RequestMappingInfo, HandlerMethod> handlerMethods = mapping.getHandlerMethods();
+
+                for (Map.Entry<RequestMappingInfo, HandlerMethod> handlerEntry :
+                        handlerMethods.entrySet()) {
+                    RequestMappingInfo mappingInfo = handlerEntry.getKey();
+                    HandlerMethod handlerMethod = handlerEntry.getValue();
+
+                    boolean isGetHandler = false;
+                    try {
+                        Set<RequestMethod> methods = mappingInfo.getMethodsCondition().getMethods();
+                        isGetHandler = methods.isEmpty() || methods.contains(RequestMethod.GET);
+                    } catch (Exception e) {
+                        isGetHandler = true;
+                    }
+
+                    if (isGetHandler) {
+                        Set<String> patterns = extractPatternsUsingDirectPaths(mappingInfo);
+
+                        if (patterns.isEmpty()) {
+                            patterns = extractPatternsFromString(mappingInfo);
+                        }
+
+                        validGetEndpoints.addAll(patterns);
+                    }
+                }
+            }
+
+            if (validGetEndpoints.isEmpty()) {
+                logger.warn("No endpoints discovered. Adding common endpoints as fallback.");
+                validGetEndpoints.add("/");
+                validGetEndpoints.add("/api/**");
+                validGetEndpoints.add("/**");
+            }
+        } catch (Exception e) {
+            logger.error("Error discovering endpoints", e);
+        }
+    }
+
+    private Set<String> extractPatternsUsingDirectPaths(RequestMappingInfo mappingInfo) {
+        Set<String> patterns = new HashSet<>();
+
+        try {
+            Method getDirectPathsMethod = mappingInfo.getClass().getMethod("getDirectPaths");
+            Object result = getDirectPathsMethod.invoke(mappingInfo);
+            if (result instanceof Set) {
+                @SuppressWarnings("unchecked")
+                Set<String> resultSet = (Set<String>) result;
+                patterns.addAll(resultSet);
+            }
+        } catch (Exception e) {
+            // Return empty set if method not found or fails
+        }
+
+        return patterns;
+    }
+
+    private Set<String> extractPatternsFromString(RequestMappingInfo mappingInfo) {
+        Set<String> patterns = new HashSet<>();
+        try {
+            String infoString = mappingInfo.toString();
+            if (infoString.contains("{")) {
+                String patternsSection =
+                        infoString.substring(infoString.indexOf("{") + 1, infoString.indexOf("}"));
+
+                for (String pattern : patternsSection.split(",")) {
+                    pattern = pattern.trim();
+                    if (!pattern.isEmpty()) {
+                        patterns.add(pattern);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            // Return empty set if parsing fails
+        }
+        return patterns;
+    }
+
+    public boolean isValidGetEndpoint(String uri) {
+        if (!endpointsDiscovered) {
+            discoverEndpoints();
+            endpointsDiscovered = true;
+        }
+
+        if (validGetEndpoints.contains(uri)) {
+            return true;
+        }
+
+        if (matchesWildcardOrPathVariable(uri)) {
+            return true;
+        }
+
+        if (matchesPathSegments(uri)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private boolean matchesWildcardOrPathVariable(String uri) {
+        for (String pattern : validGetEndpoints) {
+            if (pattern.contains("*") || pattern.contains("{")) {
+                int wildcardIndex = pattern.indexOf('*');
+                int variableIndex = pattern.indexOf('{');
+
+                int cutoffIndex;
+                if (wildcardIndex < 0) {
+                    cutoffIndex = variableIndex;
+                } else if (variableIndex < 0) {
+                    cutoffIndex = wildcardIndex;
+                } else {
+                    cutoffIndex = Math.min(wildcardIndex, variableIndex);
+                }
+
+                String staticPrefix = pattern.substring(0, cutoffIndex);
+
+                if (uri.startsWith(staticPrefix)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean matchesPathSegments(String uri) {
+        for (String pattern : validGetEndpoints) {
+            if (!pattern.contains("*") && !pattern.contains("{")) {
+                String[] patternSegments = pattern.split("/");
+                String[] uriSegments = uri.split("/");
+
+                if (uriSegments.length < patternSegments.length) {
+                    continue;
+                }
+
+                boolean match = true;
+                for (int i = 0; i < patternSegments.length; i++) {
+                    if (!patternSegments[i].equals(uriSegments[i])) {
+                        match = false;
+                        break;
+                    }
+                }
+
+                if (match) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public Set<String> getValidGetEndpoints() {
+        if (!endpointsDiscovered) {
+            discoverEndpoints();
+            endpointsDiscovered = true;
+        }
+        return new HashSet<>(validGetEndpoints);
+    }
+
+    private void logAllEndpoints() {
+        Set<String> sortedEndpoints = new TreeSet<>(validGetEndpoints);
+
+        logger.info("=== BEGIN: All discovered GET endpoints ===");
+        for (String endpoint : sortedEndpoints) {
+            logger.info("Endpoint: {}", endpoint);
+        }
+        logger.info("=== END: All discovered GET endpoints ===");
+    }
+}

src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java

@@ -6,21 +6,44 @@ import org.springframework.web.servlet.HandlerInterceptor;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
 @Component
+@Slf4j
+@RequiredArgsConstructor
 public class EndpointInterceptor implements HandlerInterceptor {
 
     private final EndpointConfiguration endpointConfiguration;
 
-    public EndpointInterceptor(EndpointConfiguration endpointConfiguration) {
-        this.endpointConfiguration = endpointConfiguration;
-    }
-
     @Override
     public boolean preHandle(
             HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
         String requestURI = request.getRequestURI();
-        if (!endpointConfiguration.isEndpointEnabled(requestURI)) {
+        boolean isEnabled;
+
+        // Extract the specific endpoint name (e.g: /api/v1/general/remove-pages -> remove-pages)
+        if (requestURI.contains("/api/v1") && requestURI.split("/").length > 4) {
+
+            String[] requestURIParts = requestURI.split("/");
+            String requestEndpoint;
+
+            // Endpoint: /api/v1/convert/pdf/img becomes pdf-to-img
+            if ("convert".equals(requestURIParts[3]) && requestURIParts.length > 5) {
+                requestEndpoint = requestURIParts[4] + "-to-" + requestURIParts[5];
+            } else {
+                requestEndpoint = requestURIParts[4];
+            }
+
+            log.debug("Request endpoint: {}", requestEndpoint);
+            isEnabled = endpointConfiguration.isEndpointEnabled(requestEndpoint);
+            log.debug("Is endpoint enabled: {}", isEnabled);
+        } else {
+            isEnabled = endpointConfiguration.isEndpointEnabled(requestURI);
+        }
+
+        if (!isEnabled) {
             response.sendError(HttpServletResponse.SC_FORBIDDEN, "This endpoint is disabled");
             return false;
         }

src/main/java/stirling/software/SPDF/config/EnterpriseEndpointFilter.java

@@ -0,0 +1,38 @@
+package stirling.software.SPDF.config;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+@Component
+public class EnterpriseEndpointFilter extends OncePerRequestFilter {
+    private final boolean runningProOrHigher;
+
+    public EnterpriseEndpointFilter(@Qualifier("runningProOrHigher") boolean runningProOrHigher) {
+        this.runningProOrHigher = runningProOrHigher;
+    }
+
+    @Override
+    protected void doFilterInternal(
+            HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+
+        if (!runningProOrHigher && isPrometheusEndpointRequest(request)) {
+            response.setStatus(HttpStatus.NOT_FOUND.value());
+            return;
+        }
+        filterChain.doFilter(request, response);
+    }
+
+    private boolean isPrometheusEndpointRequest(HttpServletRequest request) {
+        return request.getRequestURI().contains("/actuator/");
+    }
+}

src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java

@@ -62,7 +62,7 @@ public class ExternalAppDepConfig {
     private List<String> getAffectedFeatures(String group) {
         return endpointConfiguration.getEndpointsForGroup(group).stream()
                 .map(endpoint -> formatEndpointAsFeature(endpoint))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private String formatEndpointAsFeature(String endpoint) {

src/main/java/stirling/software/SPDF/config/FileFallbackTemplateResolver.java

@@ -11,8 +11,11 @@ import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver;
 import org.thymeleaf.templateresource.FileTemplateResource;
 import org.thymeleaf.templateresource.ITemplateResource;
 
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.SPDF.model.InputStreamTemplateResource;
 
+@Slf4j
 public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateResolver {
 
     private final ResourceLoader resourceLoader;
@@ -40,7 +43,8 @@ public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateRe
                 return new FileTemplateResource(resource.getFile().getPath(), characterEncoding);
             }
         } catch (IOException e) {
-
+            // Log the exception to help with debugging issues loading external templates
+            log.warn("Unable to read template '{}' from file system", resourceName, e);
         }
 
         InputStream inputStream =

src/main/java/stirling/software/SPDF/config/InitialSetup.java

@@ -14,6 +14,7 @@ import io.micrometer.common.util.StringUtils;
 
 import jakarta.annotation.PostConstruct;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -22,14 +23,11 @@ import stirling.software.SPDF.utils.GeneralUtils;
 @Component
 @Slf4j
 @Order(Ordered.HIGHEST_PRECEDENCE + 1)
+@RequiredArgsConstructor
 public class InitialSetup {
 
     private final ApplicationProperties applicationProperties;
 
-    public InitialSetup(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
-
     @PostConstruct
     public void init() throws IOException {
         initUUIDKey();
@@ -75,7 +73,7 @@ public class InitialSetup {
         // Initialize Terms and Conditions
         String termsUrl = applicationProperties.getLegal().getTermsAndConditions();
         if (StringUtils.isEmpty(termsUrl)) {
-            String defaultTermsUrl = "https://www.stirlingpdf.com/terms-and-conditions";
+            String defaultTermsUrl = "https://www.stirlingpdf.com/terms";
             GeneralUtils.saveKeyToSettings("legal.termsAndConditions", defaultTermsUrl);
             applicationProperties.getLegal().setTermsAndConditions(defaultTermsUrl);
         }

src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java

@@ -10,17 +10,16 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
+@RequiredArgsConstructor
 public class LocaleConfiguration implements WebMvcConfigurer {
 
     private final ApplicationProperties applicationProperties;
 
-    public LocaleConfiguration(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
-
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(localeChangeInterceptor());
@@ -52,7 +51,7 @@ public class LocaleConfiguration implements WebMvcConfigurer {
                     defaultLocale = tempLocale;
                 } else {
                     System.err.println(
-                            "Invalid APP_LOCALE environment variable value. Falling back to default Locale.UK.");
+                            "Invalid SYSTEM_DEFAULTLOCALE environment variable value. Falling back to default en-GB.");
                 }
             }
         }

src/main/java/stirling/software/SPDF/config/MetricsConfig.java

@@ -15,7 +15,7 @@ public class MetricsConfig {
         return new MeterFilter() {
             @Override
             public MeterFilterReply accept(Meter.Id id) {
-                if (id.getName().equals("http.requests")) {
+                if ("http.requests".equals(id.getName())) {
                     return MeterFilterReply.NEUTRAL;
                 }
                 return MeterFilterReply.DENY;

src/main/java/stirling/software/SPDF/config/MetricsFilter.java

@@ -2,7 +2,6 @@ package stirling.software.SPDF.config;
 
 import java.io.IOException;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -15,18 +14,16 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.utils.RequestUriUtils;
 
 @Component
+@RequiredArgsConstructor
 public class MetricsFilter extends OncePerRequestFilter {
 
     private final MeterRegistry meterRegistry;
 
-    @Autowired
-    public MetricsFilter(MeterRegistry meterRegistry) {
-        this.meterRegistry = meterRegistry;
-    }
-
     @Override
     protected void doFilterInternal(
             HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)

src/main/java/stirling/software/SPDF/config/OpenApiConfig.java

@@ -5,20 +5,26 @@ import org.springframework.context.annotation.Configuration;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
+@RequiredArgsConstructor
 public class OpenApiConfig {
 
     private final ApplicationProperties applicationProperties;
 
-    public OpenApiConfig(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
+    private static final String DEFAULT_TITLE = "Stirling PDF API";
+    private static final String DEFAULT_DESCRIPTION =
+            "API documentation for all Server-Side processing.\n"
+                    + "Please note some functionality might be UI only and missing from here.";
 
     @Bean
     public OpenAPI customOpenAPI() {
@@ -27,29 +33,34 @@ public class OpenApiConfig {
             // default version if all else fails
             version = "1.0.0";
         }
-        SecurityScheme apiKeyScheme =
-                new SecurityScheme()
-                        .type(SecurityScheme.Type.APIKEY)
-                        .in(SecurityScheme.In.HEADER)
-                        .name("X-API-KEY");
+        Info info =
+                new Info()
+                        .title(DEFAULT_TITLE)
+                        .version(version)
+                        .license(
+                                new License()
+                                        .name("MIT")
+                                        .url(
+                                                "https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/refs/heads/main/LICENSE")
+                                        .identifier("MIT"))
+                        .termsOfService("https://www.stirlingpdf.com/terms")
+                        .contact(
+                                new Contact()
+                                        .name("Stirling Software")
+                                        .url("https://www.stirlingpdf.com")
+                                        .email("contact@stirlingpdf.com"))
+                        .description(DEFAULT_DESCRIPTION);
         if (!applicationProperties.getSecurity().getEnableLogin()) {
-            return new OpenAPI()
-                    .components(new Components())
-                    .info(
-                            new Info()
-                                    .title("Stirling PDF API")
-                                    .version(version)
-                                    .description(
-                                            "API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."));
+            return new OpenAPI().components(new Components()).info(info);
         } else {
+            SecurityScheme apiKeyScheme =
+                    new SecurityScheme()
+                            .type(SecurityScheme.Type.APIKEY)
+                            .in(SecurityScheme.In.HEADER)
+                            .name("X-API-KEY");
             return new OpenAPI()
                     .components(new Components().addSecuritySchemes("apiKey", apiKeyScheme))
-                    .info(
-                            new Info()
-                                    .title("Stirling PDF API")
-                                    .version(version)
-                                    .description(
-                                            "API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."))
+                    .info(info)
                     .addSecurityItem(new SecurityRequirement().addList("apiKey"));
         }
     }

src/main/java/stirling/software/SPDF/config/WebMvcConfig.java

@@ -5,15 +5,14 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import lombok.RequiredArgsConstructor;
+
 @Configuration
+@RequiredArgsConstructor
 public class WebMvcConfig implements WebMvcConfigurer {
 
     private final EndpointInterceptor endpointInterceptor;
 
-    public WebMvcConfig(EndpointInterceptor endpointInterceptor) {
-        this.endpointInterceptor = endpointInterceptor;
-    }
-
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(endpointInterceptor);

src/main/java/stirling/software/SPDF/config/security/AppUpdateAuthService.java

@@ -6,24 +6,21 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.config.interfaces.ShowAdminInterface;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.UserRepository;
 
 @Service
+@RequiredArgsConstructor
 class AppUpdateAuthService implements ShowAdminInterface {
 
     private final UserRepository userRepository;
 
     private final ApplicationProperties applicationProperties;
 
-    public AppUpdateAuthService(
-            UserRepository userRepository, ApplicationProperties applicationProperties) {
-        this.userRepository = userRepository;
-        this.applicationProperties = applicationProperties;
-    }
-
     @Override
     public boolean getShowUpdateOnlyAdmins() {
         boolean showUpdate = applicationProperties.getSystem().isShowUpdate();
@@ -35,7 +32,7 @@ class AppUpdateAuthService implements ShowAdminInterface {
         if (authentication == null || !authentication.isAuthenticated()) {
             return !showUpdateOnlyAdmin;
         }
-        if (authentication.getName().equalsIgnoreCase("anonymousUser")) {
+        if ("anonymousUser".equalsIgnoreCase(authentication.getName())) {
             return !showUpdateOnlyAdmin;
         }
         Optional<User> user = userRepository.findByUsername(authentication.getName());

src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java

@@ -19,7 +19,7 @@ import com.coveo.saml.SamlException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.SPDFApplication;
@@ -32,7 +32,7 @@ import stirling.software.SPDF.model.provider.KeycloakProvider;
 import stirling.software.SPDF.utils.UrlUtils;
 
 @Slf4j
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
 
     public static final String LOGOUT_PATH = "/login?logout=true";

src/main/java/stirling/software/SPDF/config/security/CustomUserDetailsService.java

@@ -2,7 +2,6 @@ package stirling.software.SPDF.config.security;
 
 import java.util.Collection;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.GrantedAuthority;
@@ -12,23 +11,20 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.model.Authority;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.UserRepository;
 
 @Service
+@RequiredArgsConstructor
 public class CustomUserDetailsService implements UserDetailsService {
 
     private final UserRepository userRepository;
 
     private final LoginAttemptService loginAttemptService;
 
-    public CustomUserDetailsService(
-            UserRepository userRepository, LoginAttemptService loginAttemptService) {
-        this.userRepository = userRepository;
-        this.loginAttemptService = loginAttemptService;
-    }
-
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         User user =
@@ -58,6 +54,6 @@ public class CustomUserDetailsService implements UserDetailsService {
     private Collection<? extends GrantedAuthority> getAuthorities(Set<Authority> authorities) {
         return authorities.stream()
                 .map(authority -> new SimpleGrantedAuthority(authority.getAuthority()))
-                .collect(Collectors.toList());
+                .toList();
     }
 }

src/main/java/stirling/software/SPDF/config/security/IPRateLimitingFilter.java

@@ -7,8 +7,11 @@ import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.utils.RequestUriUtils;
 
+@RequiredArgsConstructor
 public class IPRateLimitingFilter implements Filter {
 
     private final ConcurrentHashMap<String, AtomicInteger> requestCounts =
@@ -17,11 +20,6 @@ public class IPRateLimitingFilter implements Filter {
     private final int maxRequests;
     private final int maxGetRequests;
 
-    public IPRateLimitingFilter(int maxRequests, int maxGetRequests) {
-        this.maxRequests = maxRequests;
-        this.maxGetRequests = maxGetRequests;
-    }
-
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
             throws IOException, ServletException {

src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Component;
 
 import jakarta.annotation.PostConstruct;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.interfaces.DatabaseInterface;
@@ -16,6 +17,7 @@ import stirling.software.SPDF.model.exception.UnsupportedProviderException;
 
 @Slf4j
 @Component
+@RequiredArgsConstructor
 public class InitialSecuritySetup {
 
     private final UserService userService;
@@ -24,15 +26,6 @@ public class InitialSecuritySetup {
 
     private final DatabaseInterface databaseService;
 
-    public InitialSecuritySetup(
-            UserService userService,
-            ApplicationProperties applicationProperties,
-            DatabaseInterface databaseService) {
-        this.userService = userService;
-        this.applicationProperties = applicationProperties;
-        this.databaseService = databaseService;
-    }
-
     @PostConstruct
     public void init() {
         try {

src/main/java/stirling/software/SPDF/config/security/LoginAttemptService.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 
 import jakarta.annotation.PostConstruct;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -14,6 +15,7 @@ import stirling.software.SPDF.model.AttemptCounter;
 
 @Service
 @Slf4j
+@RequiredArgsConstructor
 public class LoginAttemptService {
 
     private final ApplicationProperties applicationProperties;
@@ -26,10 +28,6 @@ public class LoginAttemptService {
 
     private boolean isBlockedEnabled = true;
 
-    public LoginAttemptService(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
-
     @PostConstruct
     public void init() {
         MAX_ATTEMPT = applicationProperties.getSecurity().getLoginAttemptCount();

src/main/java/stirling/software/SPDF/config/security/RateLimitResetScheduler.java

@@ -3,15 +3,14 @@ package stirling.software.SPDF.config.security;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import lombok.RequiredArgsConstructor;
+
 @Component
+@RequiredArgsConstructor
 public class RateLimitResetScheduler {
 
     private final IPRateLimitingFilter rateLimitingFilter;
 
-    public RateLimitResetScheduler(IPRateLimitingFilter rateLimitingFilter) {
-        this.rateLimitingFilter = rateLimitingFilter;
-    }
-
     @Scheduled(cron = "0 0 0 * * MON") // At 00:00 every Monday TODO: configurable
     public void resetRateLimit() {
         rateLimitingFilter.resetRequestCounts();

src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java

@@ -46,13 +46,13 @@ import stirling.software.SPDF.repository.PersistentLoginRepository;
 @EnableWebSecurity
 @EnableMethodSecurity
 @Slf4j
-@DependsOn("runningEE")
+@DependsOn("runningProOrHigher")
 public class SecurityConfiguration {
 
     private final CustomUserDetailsService userDetailsService;
     private final UserService userService;
     private final boolean loginEnabledValue;
-    private final boolean runningEE;
+    private final boolean runningProOrHigher;
 
     private final ApplicationProperties applicationProperties;
     private final UserAuthenticationFilter userAuthenticationFilter;
@@ -69,7 +69,7 @@ public class SecurityConfiguration {
             CustomUserDetailsService userDetailsService,
             @Lazy UserService userService,
             @Qualifier("loginEnabled") boolean loginEnabledValue,
-            @Qualifier("runningEE") boolean runningEE,
+            @Qualifier("runningProOrHigher") boolean runningProOrHigher,
             ApplicationProperties applicationProperties,
             UserAuthenticationFilter userAuthenticationFilter,
             LoginAttemptService loginAttemptService,
@@ -83,7 +83,7 @@ public class SecurityConfiguration {
         this.userDetailsService = userDetailsService;
         this.userService = userService;
         this.loginEnabledValue = loginEnabledValue;
-        this.runningEE = runningEE;
+        this.runningProOrHigher = runningProOrHigher;
         this.applicationProperties = applicationProperties;
         this.userAuthenticationFilter = userAuthenticationFilter;
         this.loginAttemptService = loginAttemptService;
@@ -254,7 +254,7 @@ public class SecurityConfiguration {
                                         .permitAll());
             }
             // Handle SAML
-            if (applicationProperties.getSecurity().isSaml2Active() && runningEE) {
+            if (applicationProperties.getSecurity().isSaml2Active() && runningProOrHigher) {
                 // Configure the authentication provider
                 OpenSaml4AuthenticationProvider authenticationProvider =
                         new OpenSaml4AuthenticationProvider();

src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java

@@ -3,7 +3,6 @@ package stirling.software.SPDF.config.security;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Lazy;
@@ -99,7 +98,7 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
                                             authority ->
                                                     new SimpleGrantedAuthority(
                                                             authority.getAuthority()))
-                                    .collect(Collectors.toList());
+                                    .toList();
                     authentication = new ApiKeyAuthenticationToken(user.get(), apiKey, authorities);
                     SecurityContextHolder.getContext().setAuthentication(authentication);
                 } catch (AuthenticationException e) {

src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java

@@ -121,7 +121,7 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
         if (probe.isConsumed()) {
             response.setHeader(
                     "X-Rate-Limit-Remaining",
-                    Newlines.stripAll(Long.toString(probe.getRemainingTokens())));
+                    stripNewlines(Newlines.stripAll(Long.toString(probe.getRemainingTokens()))));
             filterChain.doFilter(request, response);
         } else {
             long waitForRefill = probe.getNanosToWaitForRefill() / 1_000_000_000;
@@ -141,4 +141,8 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
                         .build();
         return Bucket.builder().addLimit(limit).build();
     }
+
+    private static String stripNewlines(final String s) {
+        return s.replaceAll("[\n\r]", "");
+    }
 }

src/main/java/stirling/software/SPDF/config/security/UserService.java

@@ -3,7 +3,6 @@ package stirling.software.SPDF.config.security;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -20,6 +19,7 @@ import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.interfaces.DatabaseInterface;
@@ -33,6 +33,7 @@ import stirling.software.SPDF.repository.UserRepository;
 
 @Service
 @Slf4j
+@RequiredArgsConstructor
 public class UserService implements UserServiceInterface {
 
     private final UserRepository userRepository;
@@ -49,23 +50,6 @@ public class UserService implements UserServiceInterface {
 
     private final ApplicationProperties applicationProperties;
 
-    public UserService(
-            UserRepository userRepository,
-            AuthorityRepository authorityRepository,
-            PasswordEncoder passwordEncoder,
-            MessageSource messageSource,
-            SessionPersistentRegistry sessionRegistry,
-            DatabaseInterface databaseService,
-            ApplicationProperties applicationProperties) {
-        this.userRepository = userRepository;
-        this.authorityRepository = authorityRepository;
-        this.passwordEncoder = passwordEncoder;
-        this.messageSource = messageSource;
-        this.sessionRegistry = sessionRegistry;
-        this.databaseService = databaseService;
-        this.applicationProperties = applicationProperties;
-    }
-
     @Transactional
     public void migrateOauth2ToSSO() {
         userRepository
@@ -108,7 +92,7 @@ public class UserService implements UserServiceInterface {
         // Convert each Authority object into a SimpleGrantedAuthority object.
         return user.getAuthorities().stream()
                 .map((Authority authority) -> new SimpleGrantedAuthority(authority.getAuthority()))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private String generateApiKey() {
@@ -206,6 +190,7 @@ public class UserService implements UserServiceInterface {
         user.setPassword(passwordEncoder.encode(password));
         user.setEnabled(true);
         user.setAuthenticationType(AuthenticationType.WEB);
+        user.addAuthority(new Authority(Role.USER.getRoleId(), user));
         userRepository.save(user);
         databaseService.exportDatabase();
     }
@@ -231,6 +216,22 @@ public class UserService implements UserServiceInterface {
         saveUser(username, password, role, false);
     }
 
+    public void saveUser(String username, String password, boolean firstLogin, boolean enabled)
+            throws IllegalArgumentException, SQLException, UnsupportedProviderException {
+        if (!isUsernameValid(username)) {
+            throw new IllegalArgumentException(getInvalidUsernameMessage());
+        }
+        User user = new User();
+        user.setUsername(username);
+        user.setPassword(passwordEncoder.encode(password));
+        user.addAuthority(new Authority(Role.USER.getRoleId(), user));
+        user.setEnabled(enabled);
+        user.setAuthenticationType(AuthenticationType.WEB);
+        user.setFirstLogin(firstLogin);
+        userRepository.save(user);
+        databaseService.exportDatabase();
+    }
+
     public void deleteUser(String username) {
         Optional<User> userOpt = findByUsernameIgnoreCase(username);
         if (userOpt.isPresent()) {
@@ -353,6 +354,7 @@ public class UserService implements UserServiceInterface {
 
         List<String> notAllowedUserList = new ArrayList<>();
         notAllowedUserList.add("ALL_USERS".toLowerCase());
+        notAllowedUserList.add("anonymoususer");
         boolean notAllowedUser = notAllowedUserList.contains(username.toLowerCase());
         return (isValidSimpleUsername || isValidEmail) && !notAllowedUser;
     }
@@ -406,6 +408,8 @@ public class UserService implements UserServiceInterface {
 
         if (principal instanceof UserDetails detailsUser) {
             return detailsUser.getUsername();
+        } else if (principal instanceof stirling.software.SPDF.model.User domainUser) {
+            return domainUser.getUsername();
         } else if (principal instanceof OAuth2User oAuth2User) {
             return oAuth2User.getAttribute(
                     applicationProperties.getSecurity().getOauth2().getUseAsUsername());
@@ -458,6 +462,12 @@ public class UserService implements UserServiceInterface {
 
     @Override
     public long getTotalUsersCount() {
-        return userRepository.count();
+        // Count all users in the database
+        long userCount = userRepository.count();
+        // Exclude the internal API user from the count
+        if (findByUsernameIgnoreCase(Role.INTERNAL_API_USER.getRoleId()).isPresent()) {
+            userCount -= 1;
+        }
+        return userCount;
     }
 }

src/main/java/stirling/software/SPDF/config/security/database/DatabaseConfig.java

@@ -27,18 +27,18 @@ public class DatabaseConfig {
     public static final String POSTGRES_DRIVER = "org.postgresql.Driver";
 
     private final ApplicationProperties applicationProperties;
-    private final boolean runningEE;
+    private final boolean runningProOrHigher;
 
     public DatabaseConfig(
             ApplicationProperties applicationProperties,
-            @Qualifier("runningEE") boolean runningEE) {
+            @Qualifier("runningProOrHigher") boolean runningProOrHigher) {
         DATASOURCE_DEFAULT_URL =
                 "jdbc:h2:file:"
                         + InstallationPathConfig.getConfigPath()
                         + "stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE";
         log.debug("Database URL: {}", DATASOURCE_DEFAULT_URL);
         this.applicationProperties = applicationProperties;
-        this.runningEE = runningEE;
+        this.runningProOrHigher = runningProOrHigher;
     }
 
     /**
@@ -54,7 +54,7 @@ public class DatabaseConfig {
     public DataSource dataSource() throws UnsupportedProviderException {
         DataSourceBuilder<?> dataSourceBuilder = DataSourceBuilder.create();
 
-        if (!runningEE) {
+        if (!runningProOrHigher) {
             return useDefaultDataSource(dataSourceBuilder);
         }
 

src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java

@@ -240,8 +240,34 @@ public class DatabaseService implements DatabaseInterface {
     private boolean isH2Database() {
         ApplicationProperties.Datasource datasource =
                 applicationProperties.getSystem().getDatasource();
-        return !datasource.isEnableCustomDatabase()
-                || datasource.getType().equalsIgnoreCase(ApplicationProperties.Driver.H2.name());
+
+        boolean isTypeH2 =
+                datasource.getType().equalsIgnoreCase(ApplicationProperties.Driver.H2.name());
+        boolean isDBUrlH2 =
+                datasource.getCustomDatabaseUrl().contains("h2")
+                        || datasource.getCustomDatabaseUrl().contains("H2");
+        boolean isCustomDatabase = datasource.isEnableCustomDatabase();
+
+        if (isCustomDatabase) {
+            if (isTypeH2 && !isDBUrlH2) {
+                log.warn(
+                        "Datasource type is H2, but the URL does not contain 'h2'. "
+                                + "Please check your configuration.");
+                throw new IllegalStateException(
+                        "Datasource type is H2, but the URL does not contain 'h2'. Please check"
+                                + " your configuration.");
+            } else if (!isTypeH2 && isDBUrlH2) {
+                log.warn(
+                        "Datasource URL contains 'h2', but the type is not H2. "
+                                + "Please check your configuration.");
+                throw new IllegalStateException(
+                        "Datasource URL contains 'h2', but the type is not H2. Please check your"
+                                + " configuration.");
+            }
+        }
+        boolean isH2 = isTypeH2 && isDBUrlH2;
+
+        return !isCustomDatabase || isH2;
     }
 
     /**

src/main/java/stirling/software/SPDF/config/security/database/ScheduledTasks.java

@@ -6,20 +6,19 @@ import org.springframework.context.annotation.Conditional;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.config.interfaces.DatabaseInterface;
 import stirling.software.SPDF.controller.api.H2SQLCondition;
 import stirling.software.SPDF.model.exception.UnsupportedProviderException;
 
 @Component
 @Conditional(H2SQLCondition.class)
+@RequiredArgsConstructor
 public class ScheduledTasks {
 
     private final DatabaseInterface databaseService;
 
-    public ScheduledTasks(DatabaseInterface databaseService) {
-        this.databaseService = databaseService;
-    }
-
     @Scheduled(cron = "0 0 0 * * ?")
     public void performBackup() throws SQLException, UnsupportedProviderException {
         databaseService.exportDatabase();

src/main/java/stirling/software/SPDF/config/security/mail/EmailService.java

@@ -0,0 +1,63 @@
+package stirling.software.SPDF.config.security.mail;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+
+import lombok.RequiredArgsConstructor;
+
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.api.Email;
+
+/**
+ * Service class responsible for sending emails, including those with attachments. It uses
+ * JavaMailSender to send the email and is designed to handle both the message content and file
+ * attachments.
+ */
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(value = "mail.enabled", havingValue = "true", matchIfMissing = false)
+public class EmailService {
+
+    private final JavaMailSender mailSender;
+    private final ApplicationProperties applicationProperties;
+
+    /**
+     * Sends an email with an attachment asynchronously. This method is annotated with @Async, which
+     * means it will be executed asynchronously.
+     *
+     * @param email The Email object containing the recipient, subject, body, and file attachment.
+     * @throws MessagingException If there is an issue with creating or sending the email.
+     */
+    @Async
+    public void sendEmailWithAttachment(Email email) throws MessagingException {
+        ApplicationProperties.Mail mailProperties = applicationProperties.getMail();
+        MultipartFile file = email.getFileInput();
+
+        // Creates a MimeMessage to represent the email
+        MimeMessage message = mailSender.createMimeMessage();
+
+        // Helper class to set up the message content and attachments
+        MimeMessageHelper helper = new MimeMessageHelper(message, true);
+
+        // Sets the recipient, subject, body, and sender email
+        helper.addTo(email.getTo());
+        helper.setSubject(email.getSubject());
+        helper.setText(
+                email.getBody(),
+                true); // The "true" here indicates that the body contains HTML content.
+        helper.setFrom(mailProperties.getFrom());
+
+        // Adds the attachment to the email
+        helper.addAttachment(file.getOriginalFilename(), file);
+
+        // Sends the email via the configured mail sender
+        mailSender.send(message);
+    }
+}

src/main/java/stirling/software/SPDF/config/security/mail/MailConfig.java

@@ -0,0 +1,54 @@
+package stirling.software.SPDF.config.security.mail;
+
+import java.util.Properties;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.SPDF.model.ApplicationProperties;
+
+/**
+ * This configuration class provides the JavaMailSender bean, which is used to send emails. It reads
+ * email server settings from the configuration (ApplicationProperties) and configures the mail
+ * client (JavaMailSender).
+ */
+@Configuration
+@Slf4j
+@AllArgsConstructor
+@ConditionalOnProperty(value = "mail.enabled", havingValue = "true", matchIfMissing = false)
+public class MailConfig {
+
+    private final ApplicationProperties applicationProperties;
+
+    @Bean
+    public JavaMailSender javaMailSender() {
+
+        ApplicationProperties.Mail mailProperties = applicationProperties.getMail();
+
+        // Creates a new instance of JavaMailSenderImpl, which is a Spring implementation
+        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
+        mailSender.setHost(mailProperties.getHost());
+        mailSender.setPort(mailProperties.getPort());
+        mailSender.setUsername(mailProperties.getUsername());
+        mailSender.setPassword(mailProperties.getPassword());
+        mailSender.setDefaultEncoding("UTF-8");
+
+        // Retrieves the JavaMail properties to configure additional SMTP parameters
+        Properties props = mailSender.getJavaMailProperties();
+
+        // Enables SMTP authentication
+        props.put("mail.smtp.auth", "true");
+
+        // Enables STARTTLS to encrypt the connection if supported by the SMTP server
+        props.put("mail.smtp.starttls.enable", "true");
+
+        // Returns the configured mail sender, ready to send emails
+        return mailSender;
+    }
+}

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java

@@ -15,6 +15,8 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.config.security.LoginAttemptService;
 import stirling.software.SPDF.config.security.UserService;
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -23,6 +25,7 @@ import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.model.exception.UnsupportedProviderException;
 import stirling.software.SPDF.utils.RequestUriUtils;
 
+@RequiredArgsConstructor
 public class CustomOAuth2AuthenticationSuccessHandler
         extends SavedRequestAwareAuthenticationSuccessHandler {
 
@@ -30,15 +33,6 @@ public class CustomOAuth2AuthenticationSuccessHandler
     private final ApplicationProperties applicationProperties;
     private final UserService userService;
 
-    public CustomOAuth2AuthenticationSuccessHandler(
-            LoginAttemptService loginAttemptService,
-            ApplicationProperties applicationProperties,
-            UserService userService) {
-        this.applicationProperties = applicationProperties;
-        this.userService = userService;
-        this.loginAttemptService = loginAttemptService;
-    }
-
     @Override
     public void onAuthenticationSuccess(
             HttpServletRequest request, HttpServletResponse response, Authentication authentication)

src/main/java/stirling/software/SPDF/config/security/oauth2/OAuth2Configuration.java

@@ -186,7 +186,6 @@ public class OAuth2Configuration {
                         oauth.getClientSecret(),
                         oauth.getScopes(),
                         UsernameAttribute.valueOf(oauth.getUseAsUsername().toUpperCase()),
-                        oauth.getLogoutUrl(),
                         null,
                         null,
                         null);

src/main/java/stirling/software/SPDF/config/security/saml2/CustomSaml2ResponseAuthenticationConverter.java

@@ -13,6 +13,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider.ResponseToken;
 import org.springframework.security.saml2.provider.service.authentication.Saml2Authentication;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.security.UserService;
@@ -20,15 +21,12 @@ import stirling.software.SPDF.model.User;
 
 @Slf4j
 @ConditionalOnProperty(name = "security.saml2.enabled", havingValue = "true")
+@RequiredArgsConstructor
 public class CustomSaml2ResponseAuthenticationConverter
         implements Converter<ResponseToken, Saml2Authentication> {
 
     private final UserService userService;
 
-    public CustomSaml2ResponseAuthenticationConverter(UserService userService) {
-        this.userService = userService;
-    }
-
     private Map<String, List<Object>> extractAttributes(Assertion assertion) {
         Map<String, List<Object>> attributes = new HashMap<>();
 

src/main/java/stirling/software/SPDF/config/security/saml2/SAML2Configuration.java

@@ -21,6 +21,7 @@ import org.springframework.security.saml2.provider.service.web.authentication.Op
 
 import jakarta.servlet.http.HttpServletRequest;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.ApplicationProperties;
@@ -29,14 +30,11 @@ import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
 @Configuration
 @Slf4j
 @ConditionalOnProperty(value = "security.saml2.enabled", havingValue = "true")
+@RequiredArgsConstructor
 public class SAML2Configuration {
 
     private final ApplicationProperties applicationProperties;
 
-    public SAML2Configuration(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
-
     @Bean
     @ConditionalOnProperty(name = "security.saml2.enabled", havingValue = "true")
     public RelyingPartyRegistrationRepository relyingPartyRegistrations() throws Exception {

src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.config.security.session;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import jakarta.servlet.http.HttpSessionEvent;
@@ -14,7 +13,6 @@ public class CustomHttpSessionListener implements HttpSessionListener {
 
     private SessionPersistentRegistry sessionPersistentRegistry;
 
-    @Autowired
     public CustomHttpSessionListener(SessionPersistentRegistry sessionPersistentRegistry) {
         super();
         this.sessionPersistentRegistry = sessionPersistentRegistry;

src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java

@@ -12,10 +12,13 @@ import org.springframework.stereotype.Component;
 
 import jakarta.transaction.Transactional;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.model.SessionEntity;
 
 @Component
+@RequiredArgsConstructor
 public class SessionPersistentRegistry implements SessionRegistry {
 
     private final SessionRepository sessionRepository;
@@ -23,10 +26,6 @@ public class SessionPersistentRegistry implements SessionRegistry {
     @Value("${server.servlet.session.timeout:30m}")
     private Duration defaultMaxInactiveInterval;
 
-    public SessionPersistentRegistry(SessionRepository sessionRepository) {
-        this.sessionRepository = sessionRepository;
-    }
-
     @Override
     public List<Object> getAllPrincipals() {
         List<SessionEntity> sessions = sessionRepository.findAll();

src/main/java/stirling/software/SPDF/config/security/session/SessionScheduled.java

@@ -9,15 +9,14 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.security.core.session.SessionInformation;
 import org.springframework.stereotype.Component;
 
+import lombok.RequiredArgsConstructor;
+
 @Component
+@RequiredArgsConstructor
 public class SessionScheduled {
 
     private final SessionPersistentRegistry sessionPersistentRegistry;
 
-    public SessionScheduled(SessionPersistentRegistry sessionPersistentRegistry) {
-        this.sessionPersistentRegistry = sessionPersistentRegistry;
-    }
-
     @Scheduled(cron = "0 0/5 * * * ?")
     public void expireSessions() {
         Instant now = Instant.now();

src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java

@@ -14,18 +14,17 @@ import io.swagger.v3.oas.annotations.Hidden;
 
 import jakarta.servlet.http.HttpServletResponse;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.service.LanguageService;
 
 @RestController
 @RequestMapping("/js")
+@RequiredArgsConstructor
 public class AdditionalLanguageJsController {
 
     private final LanguageService languageService;
 
-    public AdditionalLanguageJsController(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
     @Hidden
     @GetMapping(value = "/additionalLanguageCode.js", produces = "application/javascript")
     public void generateAdditionalLanguageJs(HttpServletResponse response) throws IOException {

src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java

@@ -11,26 +11,23 @@ import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.apache.pdfbox.pdmodel.encryption.PDEncryption;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
+import stirling.software.SPDF.service.CustomPDFDocumentFactory;
 
 @RestController
 @RequestMapping("/api/v1/analysis")
 @Tag(name = "Analysis", description = "Analysis APIs")
+@RequiredArgsConstructor
 public class AnalysisController {
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public AnalysisController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
+    private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @PostMapping(value = "/page-count", consumes = "multipart/form-data")
     @Operation(
@@ -62,7 +59,9 @@ public class AnalysisController {
             description = "Returns title, author, subject, etc. Input:PDF Output:JSON Type:SISO")
     public Map<String, String> getDocumentProperties(@ModelAttribute PDFFile file)
             throws IOException {
-        try (PDDocument document = pdfDocumentFactory.load(file.getFileInput())) {
+        // Load the document in read-only mode to prevent modifications and ensure the integrity of
+        // the original file.
+        try (PDDocument document = pdfDocumentFactory.load(file.getFileInput(), true)) {
             PDDocumentInformation info = document.getDocumentInformation();
             Map<String, String> properties = new HashMap<>();
             properties.put("title", info.getTitle());
@@ -182,14 +181,16 @@ public class AnalysisController {
 
                 // Get permissions
                 Map<String, Boolean> permissions = new HashMap<>();
-                permissions.put("canPrint", document.getCurrentAccessPermission().canPrint());
-                permissions.put("canModify", document.getCurrentAccessPermission().canModify());
                 permissions.put(
-                        "canExtractContent",
-                        document.getCurrentAccessPermission().canExtractContent());
+                        "preventPrinting", !document.getCurrentAccessPermission().canPrint());
                 permissions.put(
-                        "canModifyAnnotations",
-                        document.getCurrentAccessPermission().canModifyAnnotations());
+                        "preventModify", !document.getCurrentAccessPermission().canModify());
+                permissions.put(
+                        "preventExtractContent",
+                        !document.getCurrentAccessPermission().canExtractContent());
+                permissions.put(
+                        "preventModifyAnnotations",
+                        !document.getCurrentAccessPermission().canModifyAnnotations());
 
                 securityInfo.put("permissions", permissions);
             } else {

src/main/java/stirling/software/SPDF/controller/api/CropController.java

@@ -10,7 +10,6 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,29 +19,28 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import lombok.RequiredArgsConstructor;
+
 import stirling.software.SPDF.model.api.general.CropPdfForm;
-import stirling.software.SPDF.service.CustomPDDocumentFactory;
+import stirling.software.SPDF.service.CustomPDFDocumentFactory;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
+@RequiredArgsConstructor
 public class CropController {
 
-    private final CustomPDDocumentFactory pdfDocumentFactory;
-
-    @Autowired
-    public CropController(CustomPDDocumentFactory pdfDocumentFactory) {
-        this.pdfDocumentFactory = pdfDocumentFactory;
-    }
+    private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @PostMapping(value = "/crop", consumes = "multipart/form-data")
     @Operation(
             summary = "Crops a PDF document",
             description =
-                    "This operation takes an input PDF file and crops it according to the given coordinates. Input:PDF Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm form) throws IOException {
-        PDDocument sourceDocument = pdfDocumentFactory.load(form);
+                    "This operation takes an input PDF file and crops it according to the given"
+                            + " coordinates. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm request) throws IOException {
+        PDDocument sourceDocument = pdfDocumentFactory.load(request);
 
         PDDocument newDocument =
                 pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
@@ -66,7 +64,8 @@ public class CropController {
             contentStream.saveGraphicsState();
 
             // Define the crop area
-            contentStream.addRect(form.getX(), form.getY(), form.getWidth(), form.getHeight());
+            contentStream.addRect(
+                    request.getX(), request.getY(), request.getWidth(), request.getHeight());
             contentStream.clip();
 
             // Draw the entire formXObject
@@ -78,7 +77,11 @@ public class CropController {
 
             // Now, set the new page's media box to the cropped size
             newPage.setMediaBox(
-                    new PDRectangle(form.getX(), form.getY(), form.getWidth(), form.getHeight()));
+                    new PDRectangle(
+                            request.getX(),
+                            request.getY(),
+                            request.getWidth(),
+                            request.getHeight()));
         }
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -89,7 +92,7 @@ public class CropController {
         byte[] pdfContent = baos.toByteArray();
         return WebResponseUtils.bytesToWebResponse(
                 pdfContent,
-                form.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                request.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
                         + "_cropped.pdf");
     }
 }

src/main/java/stirling/software/SPDF/controller/api/DatabaseController.java

@@ -24,6 +24,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.security.database.DatabaseService;
@@ -34,14 +35,11 @@ import stirling.software.SPDF.config.security.database.DatabaseService;
 @PreAuthorize("hasRole('ROLE_ADMIN')")
 @Conditional(H2SQLCondition.class)
 @Tag(name = "Database", description = "Database APIs for backup, import, and management")
+@RequiredArgsConstructor
 public class DatabaseController {
 
     private final DatabaseService databaseService;
 
-    public DatabaseController(DatabaseService databaseService) {
-        this.databaseService = databaseService;
-    }
-
     @Operation(
             summary = "Import a database backup file",
             description = "Uploads and imports a database backup SQL file.")