diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 928b0ec96..644378d12 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -49,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": [ diff --git a/.github/workflows/PR-Demo-Comment-with-react.yml b/.github/workflows/PR-Demo-Comment-with-react.yml index fb196ca3a..105fb60b1 100644 --- a/.github/workflows/PR-Demo-Comment-with-react.yml +++ b/.github/workflows/PR-Demo-Comment-with-react.yml @@ -186,7 +186,7 @@ jobs: 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 }} + build-args: VERSION_TAG=alpha platforms: linux/amd64 - name: Set up SSH diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fc27b0731..c792e50a0 100644 --- a/.pre-commit-config.yaml +++ b/.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 diff --git a/.vscode/settings.json b/.vscode/settings.json index 2119b6263..a4be4d0cd 100644 --- a/.vscode/settings.json +++ b/.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. diff --git a/build.gradle b/build.gradle index b49b03c01..3f3219af4 100644 --- a/build.gradle +++ b/build.gradle @@ -365,7 +365,7 @@ spotless { 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() diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java index a9e1f4103..96a65fc46 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java +++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java @@ -208,7 +208,8 @@ public class PipelineDirectoryProcessor { // Check against allowed extensions boolean isAllowed = allowAllFiles - || inputExtensions.contains(extension); + || inputExtensions.contains( + extension.toLowerCase()); if (!isAllowed) { log.info( "Skipping file with unsupported extension: {} ({})", diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java index c3d212115..2833ee99e 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java +++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java @@ -112,7 +112,8 @@ public class PipelineProcessor { for (Resource file : outputFiles) { boolean hasInputFileType = false; for (String extension : inputFileTypes) { - if ("ALL".equals(extension) || file.getFilename().endsWith(extension)) { + if ("ALL".equals(extension) + || file.getFilename().toLowerCase().endsWith(extension)) { hasInputFileType = true; MultiValueMap body = new LinkedMultiValueMap<>(); body.add("fileInput", file); @@ -166,7 +167,9 @@ public class PipelineProcessor { .filter( file -> finalinputFileTypes.stream() - .anyMatch(file.getFilename()::endsWith)) + .anyMatch( + file.getFilename().toLowerCase() + ::endsWith)) .toList(); } // Check if there are matching files