impl migration to pdfium for attachments and remove images

# Conflicts:
#	app/common/build.gradle

.github/workflows/backend-build.yml

@@ -1,7 +1,7 @@
 name: Backend build, format check, and coverage
 
-# Reusable workflow called from build.yml. Runs the full backend build matrix
-# (JDK 21/25 × spring-security on/off), Spotless formatting check, JUnit, and
+# Reusable workflow called from build.yml. Runs the backend build matrix
+# (JDK 25 × spring-security on/off), Spotless formatting check, JUnit, and
 # posts Jacoco coverage to PRs.
 on:
   workflow_call:
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk-version: [21, 25]
+        jdk-version: [25]
         spring-security: [true, false]
     steps:
       - name: Harden Runner

.github/workflows/multiOSReleases.yml

@@ -90,21 +90,21 @@ jobs:
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
             case "${{ github.event.inputs.platform }}" in
               "windows")
-                echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"}]}' >> $GITHUB_OUTPUT
+                echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64","jpdfium_platforms":"windows-x64"}]}' >> $GITHUB_OUTPUT
                 ;;
               "macos")
-                echo 'matrix={"include":[{"platform":"macos-15","args":"--target universal-apple-darwin","name":"macos-universal"}]}' >> $GITHUB_OUTPUT
+                echo 'matrix={"include":[{"platform":"macos-15","args":"--target universal-apple-darwin","name":"macos-universal","jpdfium_platforms":"darwin-arm64,darwin-x64"}]}' >> $GITHUB_OUTPUT
                 ;;
               "linux")
-                echo 'matrix={"include":[{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT
+                echo 'matrix={"include":[{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64","jpdfium_platforms":"linux-x64"}]}' >> $GITHUB_OUTPUT
                 ;;
               *)
-                echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-15","args":"--target universal-apple-darwin","name":"macos-universal"},{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT
+                echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64","jpdfium_platforms":"windows-x64"},{"platform":"macos-15","args":"--target universal-apple-darwin","name":"macos-universal","jpdfium_platforms":"darwin-arm64,darwin-x64"},{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64","jpdfium_platforms":"linux-x64"}]}' >> $GITHUB_OUTPUT
                 ;;
             esac
           else
             # For push/release events, build all platforms
-            echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-15","args":"--target universal-apple-darwin","name":"macos-universal"},{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT
+            echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64","jpdfium_platforms":"windows-x64"},{"platform":"macos-15","args":"--target universal-apple-darwin","name":"macos-universal","jpdfium_platforms":"darwin-arm64,darwin-x64"},{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64","jpdfium_platforms":"linux-x64"}]}' >> $GITHUB_OUTPUT
           fi
 
   build-jars:
@@ -256,15 +256,17 @@ jobs:
         if: matrix.platform == 'macos-15'
         env:
           AARCH64_JAVA_HOME: ${{ env.JAVA_HOME }}
+          JPDFIUM_PLATFORMS: ${{ matrix.jpdfium_platforms }}
         run: task desktop:jlink:universal-mac
 
       - name: Prepare desktop build
-        run: task desktop:prepare
         env:
           MAVEN_USER: ${{ secrets.MAVEN_USER }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
           MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           DISABLE_ADDITIONAL_FEATURES: true
+          JPDFIUM_PLATFORMS: ${{ matrix.jpdfium_platforms }}
+        run: task desktop:prepare
 
       # DigiCert KeyLocker Setup (Cloud HSM)
       - name: Setup DigiCert KeyLocker

.github/workflows/tauri-build.yml

@@ -47,12 +47,10 @@ jobs:
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           PLATFORM: ${{ inputs.platform }}
         run: |
-          WINDOWS='{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"}'
-          MACOS='{"platform":"macos-15","args":"--target universal-apple-darwin","name":"macos-universal"}'
-          LINUX='{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}'
+          WINDOWS='{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64","jpdfium_platforms":"windows-x64"}'
+          MACOS='{"platform":"macos-15","args":"--target universal-apple-darwin","name":"macos-universal","jpdfium_platforms":"darwin-arm64,darwin-x64"}'
+          LINUX='{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64","jpdfium_platforms":"linux-x64"}'
 
-          # Resolve requested platform — populated by either workflow_dispatch
-          # or workflow_call inputs; both paths default to "all".
           case "$PLATFORM" in
             windows) ENTRIES=("$WINDOWS") ;;
             macos)   ENTRIES=("$MACOS") ;;
@@ -112,10 +110,6 @@ jobs:
           toolchain: stable
           targets: ${{ matrix.platform == 'macos-15' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
-      # x86_64 JDK is set up first so the aarch64 step below can leave its
-      # JAVA_HOME as the active one. The macOS universal JRE build needs
-      # jmods from both arches; the x64 path is captured into the env
-      # before the second setup-java overwrites JAVA_HOME.
       - name: Set up x86_64 JDK 25 (macOS universal JRE)
         if: matrix.platform == 'macos-15'
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
@@ -142,21 +136,21 @@ jobs:
       - name: Setup Task
         uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
 
-      # Build the universal JRE before desktop:prepare so the jlink:runtime
-      # task short-circuits on its `test -d runtime/jre` status check.
       - name: Build universal macOS JRE
         if: matrix.platform == 'macos-15'
         env:
           AARCH64_JAVA_HOME: ${{ env.JAVA_HOME }}
+          JPDFIUM_PLATFORMS: ${{ matrix.jpdfium_platforms }}
         run: task desktop:jlink:universal-mac
 
       - name: Prepare desktop build
-        run: task desktop:prepare
         env:
           MAVEN_USER: ${{ secrets.MAVEN_USER }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
           MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           DISABLE_ADDITIONAL_FEATURES: true
+          JPDFIUM_PLATFORMS: ${{ matrix.jpdfium_platforms }}
+        run: task desktop:prepare
 
       # DigiCert KeyLocker Setup (Cloud HSM)
       - name: Setup DigiCert KeyLocker
@@ -269,6 +263,10 @@ jobs:
           echo "APPLE_SIGNING_IDENTITY=$CERT_ID" >> $GITHUB_ENV
           echo "Certificate imported successfully."
 
+      - name: Sign JPDFium dylibs inside bootJar (macOS only)
+        if: matrix.platform == 'macos-15' && env.APPLE_CERTIFICATE != ''
+        run: bash frontend/scripts/sign-jpdfium-dylibs-in-bootjar.sh
+
       - name: Check DMG creation dependencies (macOS only)
         if: matrix.platform == 'macos-15'
         run: |

.taskfiles/desktop.yml

@@ -3,6 +3,22 @@ version: '3'
 vars:
   JLINK_MODULES: "java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
 
+  # Override via JPDFIUM_PLATFORMS env (csv of platform keys, or 'all').
+  JPDFIUM_PLATFORMS:
+    sh: |
+      if [ -n "${JPDFIUM_PLATFORMS:-}" ]; then
+          echo "$JPDFIUM_PLATFORMS"
+      else
+          case "{{OS}}-{{ARCH}}" in
+              darwin-arm64)  echo "darwin-arm64";;
+              darwin-amd64)  echo "darwin-x64";;
+              linux-amd64)   echo "linux-x64";;
+              linux-arm64)   echo "linux-arm64";;
+              windows-amd64) echo "windows-x64";;
+              *)             echo "all";;
+          esac
+      fi
+
 tasks:
   prepare:
     desc: "Prepare desktop build dependencies"
@@ -71,15 +87,16 @@ tasks:
     deps: [jlink:jar, jlink:runtime]
 
   jlink:jar:
-    desc: "Build backend JAR for Tauri bundling"
+    desc: "Build backend JAR for Tauri bundling (host-OS natives only by default)"
     run: once
     dir: ..
     env:
       DISABLE_ADDITIONAL_FEATURES: "true"
     cmds:
-      - cmd: cmd /c gradlew.bat bootJar --no-daemon
+      - echo "Building bootJar with JPDFium natives for {{.JPDFIUM_PLATFORMS}}"
+      - cmd: cmd /c gradlew.bat bootJar --no-daemon -PjpdfiumPlatforms={{.JPDFIUM_PLATFORMS}}
         platforms: [windows]
-      - cmd: ./gradlew bootJar --no-daemon
+      - cmd: ./gradlew bootJar --no-daemon -PjpdfiumPlatforms={{.JPDFIUM_PLATFORMS}}
         platforms: [linux, darwin]
       - mkdir -p frontend/src-tauri/libs
       - cp app/core/build/libs/stirling-pdf-*.jar frontend/src-tauri/libs/

AGENTS.md

@@ -431,7 +431,7 @@ The frontend is organized with a clear separation of concerns:
 
 ## Important Notes
 
-- **Java Version**: Minimum JDK 21, supports and recommends JDK 25
+- **Java Version**: Requires JDK 25.
 - **Lombok**: Used extensively - ensure IDE plugin is installed
 - **File Persistence**:
   - **Backend**: Designed to be stateless - files are processed in memory/temp locations only

DeveloperGuide.md

@@ -11,7 +11,7 @@ This guide focuses on developing for Stirling 2.0, including both the React fron
 **Stirling 2.0** is built using:
 
 **Backend:**
-- Spring Boot (Java 21+, JDK 25 recommended)
+- Spring Boot (requires JDK 25)
 - PDFBox for core PDF operations
 - LibreOffice for document conversions
 - qpdf for PDF optimization
@@ -45,7 +45,7 @@ This guide focuses on developing for Stirling 2.0, including both the React fron
 - [Task](https://taskfile.dev/installation/) — unified command runner (recommended)
 - Docker
 - Git
-- Java JDK 21 or later (JDK 25 recommended)
+- Java JDK 25
 - Node.js 18+ and npm (required for frontend development)
 - Gradle 7.0 or later (Included within the repo)
 - [uv](https://docs.astral.sh/uv/) — Python package manager (required for engine development)
@@ -61,7 +61,7 @@ This guide focuses on developing for Stirling 2.0, including both the React fron
    cd Stirling-PDF
    ```
 
-2. Install Docker and JDK 21 (or JDK 25 recommended) if not already installed.
+2. Install Docker and JDK 25 if not already installed.
 
 3. Install a recommended Java IDE such as Eclipse, IntelliJ, or VSCode
    1. Only VSCode

app/common/build.gradle

@@ -60,6 +60,24 @@ dependencies {
         exclude group: 'com.google.code.gson', module: 'gson'
     }
 
+    api 'com.stirling:jpdfium:1.0.0'
+
+    // -PjpdfiumPlatforms=all|<csv of linux-x64,linux-arm64,darwin-x64,darwin-arm64,windows-x64>
+    def jpdfiumPlatformsProp = (project.findProperty('jpdfiumPlatforms') ?: 'all').toString().trim()
+    def jpdfiumAllPlatforms = ['linux-x64', 'linux-arm64', 'darwin-x64', 'darwin-arm64', 'windows-x64']
+    def jpdfiumPlatforms = jpdfiumPlatformsProp == 'all'
+            ? jpdfiumAllPlatforms
+            : jpdfiumPlatformsProp.split(',').collect { it.trim() }.findAll { it }
+    def jpdfiumInvalid = jpdfiumPlatforms.findAll { !jpdfiumAllPlatforms.contains(it) }
+    if (jpdfiumInvalid) {
+        throw new GradleException("Unknown jpdfiumPlatforms value(s): ${jpdfiumInvalid.join(', ')}. " +
+                "Valid: ${jpdfiumAllPlatforms.join(', ')} or 'all'.")
+    }
+    logger.lifecycle("JPDFium native platforms: ${jpdfiumPlatforms.join(', ')}")
+    jpdfiumPlatforms.each { platform ->
+        runtimeOnly "com.stirling:jpdfium-natives-${platform}:1.0.0"
+    }
+
     // ArchUnit: enforces module dependency direction (see ArchitectureTest)
     testImplementation 'com.tngtech.archunit:archunit-junit5:1.4.2'
 }

app/common/src/test/java/stirling/software/common/jpdfium/JPDFiumSmokeTest.java

@@ -0,0 +1,32 @@
+package stirling.software.common.jpdfium;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import stirling.software.jpdfium.PdfDocument;
+
+class JPDFiumSmokeTest {
+
+    @Test
+    void opensExamplePdfAndReadsPageCount(@TempDir Path tmp) throws IOException {
+        Path pdf = tmp.resolve("example.pdf");
+        try (InputStream in = getClass().getResourceAsStream("/example.pdf")) {
+            assertNotNull(in, "example.pdf must exist under src/test/resources");
+            Files.copy(in, pdf);
+        }
+
+        try (PdfDocument doc = PdfDocument.open(pdf)) {
+            assertTrue(
+                    doc.pageCount() >= 1,
+                    "PdfDocument should report at least one page for example.pdf");
+        }
+    }
+}

app/core/build.gradle

@@ -162,7 +162,8 @@ bootJar {
     manifest {
         attributes(
             'Implementation-Title': 'Stirling-PDF',
-            'Implementation-Version': project.version
+            'Implementation-Version': project.version,
+            'Enable-Native-Access': 'ALL-UNNAMED'
         )
     }
 }

app/core/src/main/java/stirling/software/SPDF/controller/api/MergeController.java

@@ -3,13 +3,14 @@ package stirling.software.SPDF.controller.api;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.apache.pdfbox.multipdf.PDFMergerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
@@ -47,6 +48,11 @@ import stirling.software.common.util.PdfErrorUtils;
 import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
+import stirling.software.jpdfium.PdfDocument;
+import stirling.software.jpdfium.PdfMerge;
+import stirling.software.jpdfium.doc.Bookmark;
+import stirling.software.jpdfium.doc.PdfBookmarkEditor;
+import stirling.software.jpdfium.doc.PdfBookmarkEditor.BookmarkTree;
 
 @GeneralApi
 @Slf4j
@@ -57,7 +63,6 @@ public class MergeController {
     private final CustomPDFDocumentFactory pdfDocumentFactory;
     private final TempFileManager tempFileManager;
 
-    // Merges a list of PDDocument objects into a single PDDocument
     public PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
         PDDocument mergedDoc = pdfDocumentFactory.createNewDocument();
         boolean success = false;
@@ -76,11 +81,8 @@ public class MergeController {
         }
     }
 
-    // Re-order files to match the explicit order provided by the front-end.
-    // fileOrder is newline-delimited original filenames in the desired order.
     private static MultipartFile[] reorderFilesByProvidedOrder(
             MultipartFile[] files, String fileOrder) {
-        // Split by various line endings and trim each entry
         String[] desired =
                 stirling.software.common.util.RegexPatternUtils.getInstance()
                         .getNewlineSplitPattern()
@@ -107,7 +109,6 @@ public class MergeController {
         return ordered.toArray(new MultipartFile[0]);
     }
 
-    // Returns a comparator for sorting MultipartFile arrays based on the given sort type
     private Comparator<MultipartFile> getSortComparator(String sortType) {
         return switch (sortType) {
             case "byFileName" ->
@@ -155,18 +156,16 @@ public class MergeController {
                             return 0;
                         }
                     };
-            case "orderProvided" -> (file1, file2) -> 0; // Default is the order provided
-            default -> (file1, file2) -> 0; // Default is the order provided
+            case "orderProvided" -> (file1, file2) -> 0;
+            default -> (file1, file2) -> 0;
         };
     }
 
-    // Parse client file IDs from JSON string
     private String[] parseClientFileIds(String clientFileIds) {
         if (clientFileIds == null || clientFileIds.trim().isEmpty()) {
             return new String[0];
         }
         try {
-            // Simple JSON array parsing - remove brackets and split by comma
             String trimmed = clientFileIds.trim();
             if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
                 String inside = trimmed.substring(1, trimmed.length() - 1).trim();
@@ -186,39 +185,29 @@ public class MergeController {
         return new String[0];
     }
 
-    // Adds a table of contents to the merged document using filenames as chapter titles
     private void addTableOfContents(PDDocument mergedDocument, MultipartFile[] files) {
-        // Create the document outline
         PDDocumentOutline outline = new PDDocumentOutline();
         mergedDocument.getDocumentCatalog().setDocumentOutline(outline);
 
-        int pageIndex = 0; // Current page index in the merged document
-
-        // Iterate through the original files
+        int pageIndex = 0;
         for (MultipartFile file : files) {
-            // Get the filename without extension to use as bookmark title
             String filename = file.getOriginalFilename();
             String title = GeneralUtils.removeExtension(filename);
 
-            // Create an outline item for this file
             PDOutlineItem item = new PDOutlineItem();
             item.setTitle(title);
 
-            // Set the destination to the first page of this file in the merged document
             if (pageIndex < mergedDocument.getNumberOfPages()) {
                 PDPage page = mergedDocument.getPage(pageIndex);
                 item.setDestination(page);
             }
-
-            // Add the item to the outline
             outline.addLast(item);
 
-            // Increment page index for the next file
             try (PDDocument doc = pdfDocumentFactory.load(file)) {
                 pageIndex += doc.getNumberOfPages();
             } catch (IOException e) {
                 ExceptionUtils.logException("document loading for TOC generation", e);
-                pageIndex++; // Increment by at least one if we can't determine page count
+                pageIndex++;
             }
         }
     }
@@ -236,7 +225,6 @@ public class MergeController {
                     }
                 }
 
-                // Fallback to XMP metadata if Info dates are missing
                 PDMetadata metadata = doc.getDocumentCatalog().getMetadata();
                 if (metadata != null) {
                     try (InputStream is = metadata.createInputStream()) {
@@ -287,7 +275,7 @@ public class MergeController {
             @ModelAttribute MergePdfsRequest request,
             @RequestParam(value = "fileOrder", required = false) String fileOrder)
             throws IOException {
-        List<File> filesToDelete = new ArrayList<>(); // List of temporary files to delete
+        List<File> filesToDelete = new ArrayList<>();
         TempFile outputTempFile = null;
 
         boolean removeCertSign = Boolean.TRUE.equals(request.getRemoveCertSign());
@@ -298,48 +286,35 @@ public class MergeController {
             files = new MultipartFile[0];
         }
 
-        // If front-end provided explicit visible order, honor it and override backend sorting
         if (fileOrder != null && !fileOrder.isBlank()) {
             log.info("Reordering files based on fileOrder parameter");
             files = reorderFilesByProvidedOrder(files, fileOrder);
         } else {
             log.info("Sorting files based on sortType: {}", request.getSortType());
-            Arrays.sort(
-                    files,
-                    getSortComparator(
-                            request.getSortType())); // Sort files based on requested sort type
+            Arrays.sort(files, getSortComparator(request.getSortType()));
         }
 
         try (TempFile mt = new TempFile(tempFileManager, ".pdf")) {
 
-            PDFMergerUtility mergerUtility = new PDFMergerUtility();
-            long totalSize = 0;
+            List<Path> inputPaths = new ArrayList<>(files.length);
             List<Integer> invalidIndexes = new ArrayList<>();
             for (int index = 0; index < files.length; index++) {
                 MultipartFile multipartFile = files[index];
-                totalSize += multipartFile.getSize();
-                File tempFile =
-                        tempFileManager.convertMultipartFileToFile(
-                                multipartFile); // Convert MultipartFile to File
-                filesToDelete.add(tempFile); // Add temp file to the list for later deletion
+                File tempFile = tempFileManager.convertMultipartFileToFile(multipartFile);
+                filesToDelete.add(tempFile);
+                inputPaths.add(tempFile.toPath());
 
-                // Pre-validate each PDF so we can report which one(s) are broken
-                // Use the original MultipartFile to avoid deleting the tempFile during validation
-                try (PDDocument ignored = pdfDocumentFactory.load(multipartFile)) {
-                    // OK
-                } catch (IOException e) {
+                try (PdfDocument ignored = PdfDocument.open(tempFile.toPath())) {
+                } catch (Exception e) {
                     ExceptionUtils.logException("PDF pre-validate", e);
                     invalidIndexes.add(index);
                 }
-                mergerUtility.addSource(tempFile); // Add source file to the merger utility
             }
 
-            mergerUtility.setDestinationFileName(mt.getFile().getAbsolutePath());
-
+            int[] pageCounts;
             try {
-                mergerUtility.mergeDocuments(
-                        pdfDocumentFactory.getStreamCacheFunction(
-                                totalSize)); // Merge the documents
+                pageCounts =
+                        mergeWithJpdfium(inputPaths, files, generateToc, mt.getFile().toPath());
             } catch (IOException e) {
                 ExceptionUtils.logException("PDF merge", e);
                 if (PdfErrorUtils.isCorruptedPdfError(e)) {
@@ -348,10 +323,26 @@ public class MergeController {
                 throw e;
             }
 
-            // Load the merged PDF document and operate on it inside try-with-resources
-            try (PDDocument mergedDocument = pdfDocumentFactory.load(mt.getFile())) {
-                // Remove signatures if removeCertSign is true
-                if (removeCertSign) {
+            boolean sigFlattenNeeded = false;
+            if (removeCertSign) {
+                try (PdfDocument check = PdfDocument.open(mt.getFile().toPath())) {
+                    sigFlattenNeeded = !check.signatures().isEmpty();
+                } catch (Exception e) {
+                    log.debug(
+                            "JPDFium signature pre-check failed; falling back to PDFBox flatten:"
+                                    + " {}",
+                            e.getMessage());
+                    sigFlattenNeeded = true;
+                }
+                if (!sigFlattenNeeded) {
+                    log.info(
+                            "removeCertSign requested but merged document has no signature"
+                                    + " fields; skipping PDFBox flatten pass");
+                }
+            }
+
+            if (sigFlattenNeeded) {
+                try (PDDocument mergedDocument = pdfDocumentFactory.load(mt.getFile())) {
                     PDDocumentCatalog catalog = mergedDocument.getDocumentCatalog();
                     PDAcroForm acroForm = catalog.getAcroForm();
                     if (acroForm != null) {
@@ -359,24 +350,26 @@ public class MergeController {
                                 acroForm.getFields().stream()
                                         .filter(PDSignatureField.class::isInstance)
                                         .toList();
-
                         if (!fieldsToRemove.isEmpty()) {
-                            acroForm.flatten(
-                                    fieldsToRemove,
-                                    false); // Flatten the fields, effectively removing them
+                            acroForm.flatten(fieldsToRemove, false);
                         }
                     }
+                    outputTempFile = new TempFile(tempFileManager, ".pdf");
+                    try {
+                        mergedDocument.save(outputTempFile.getFile());
+                    } catch (Exception e) {
+                        outputTempFile.close();
+                        outputTempFile = null;
+                        throw e;
+                    }
                 }
-
-                // Add table of contents if generateToc is true
-                if (generateToc && files.length > 0) {
-                    addTableOfContents(mergedDocument, files);
-                }
-
-                // Save the modified document to a temporary file
+            } else {
                 outputTempFile = new TempFile(tempFileManager, ".pdf");
                 try {
-                    mergedDocument.save(outputTempFile.getFile());
+                    Files.copy(
+                            mt.getFile().toPath(),
+                            outputTempFile.getFile().toPath(),
+                            java.nio.file.StandardCopyOption.REPLACE_EXISTING);
                 } catch (Exception e) {
                     outputTempFile.close();
                     outputTempFile = null;
@@ -395,7 +388,7 @@ public class MergeController {
             throw ex;
         } finally {
             for (File file : filesToDelete) {
-                tempFileManager.deleteTempFile(file); // Delete temporary files
+                tempFileManager.deleteTempFile(file);
             }
         }
 
@@ -405,4 +398,113 @@ public class MergeController {
 
         return WebResponseUtils.pdfFileToWebResponse(outputTempFile, mergedFileName);
     }
+
+    private int[] mergeWithJpdfium(
+            List<Path> inputPaths, MultipartFile[] files, boolean generateToc, Path outputPath)
+            throws IOException {
+        if (inputPaths.isEmpty()) {
+            try (PdfDocument empty = PdfDocument.open(new byte[0])) {
+                empty.save(outputPath);
+            } catch (Exception ignored) {
+                Files.write(outputPath, new byte[0]);
+            }
+            return new int[0];
+        }
+
+        List<PdfDocument> docs = new ArrayList<>(inputPaths.size());
+        int[] pageCounts = new int[inputPaths.size()];
+        int[] pageOffsets = new int[inputPaths.size()];
+        List<List<Bookmark>> sourceBookmarks = new ArrayList<>(inputPaths.size());
+        int runningOffset = 0;
+        try {
+            for (int i = 0; i < inputPaths.size(); i++) {
+                Path p = inputPaths.get(i);
+                PdfDocument doc = PdfDocument.open(p);
+                docs.add(doc);
+                pageCounts[i] = doc.pageCount();
+                pageOffsets[i] = runningOffset;
+                sourceBookmarks.add(doc.bookmarks());
+                runningOffset += pageCounts[i];
+            }
+
+            BookmarkTree combinedTree =
+                    buildCombinedBookmarkTree(files, pageOffsets, sourceBookmarks, generateToc);
+
+            try (PdfDocument merged = PdfMerge.merge(docs)) {
+                if (combinedTree.entries().isEmpty()) {
+                    merged.save(outputPath);
+                } else {
+                    PdfBookmarkEditor.setBookmarks(merged, combinedTree, outputPath);
+                }
+            }
+        } catch (RuntimeException e) {
+            throw new IOException("JPDFium merge failed", e);
+        } finally {
+            for (PdfDocument doc : docs) {
+                try {
+                    doc.close();
+                } catch (Exception ignored) {
+                }
+            }
+        }
+        return pageCounts;
+    }
+
+    private BookmarkTree buildCombinedBookmarkTree(
+            MultipartFile[] files,
+            int[] pageOffsets,
+            List<List<Bookmark>> sourceBookmarks,
+            boolean generateToc) {
+        BookmarkTree.Builder builder = BookmarkTree.builder();
+
+        if (generateToc) {
+            for (int i = 0; i < files.length; i++) {
+                String filename = files[i].getOriginalFilename();
+                String title = GeneralUtils.removeExtension(filename);
+                if (title == null || title.isBlank()) {
+                    title = "Document " + (i + 1);
+                }
+                builder.add(title, pageOffsets[i]);
+            }
+        }
+
+        for (int i = 0; i < sourceBookmarks.size(); i++) {
+            int offset = pageOffsets[i];
+            for (Bookmark bm : sourceBookmarks.get(i)) {
+                addBookmarkFlat(builder, bm, offset);
+            }
+        }
+
+        return builder.build();
+    }
+
+    private void addBookmarkFlat(BookmarkTree.Builder builder, Bookmark root, int offset) {
+        final int maxNodes = 100_000;
+        java.util.Deque<Bookmark> stack = new java.util.ArrayDeque<>();
+        java.util.Set<Bookmark> visited =
+                java.util.Collections.newSetFromMap(new java.util.IdentityHashMap<>());
+        stack.push(root);
+        int processed = 0;
+        while (!stack.isEmpty() && processed < maxNodes) {
+            Bookmark bm = stack.pop();
+            if (!visited.add(bm)) {
+                continue;
+            }
+            processed++;
+            if (bm.isInternal() && bm.title() != null) {
+                builder.add(bm.title(), offset + bm.pageIndex());
+            }
+            if (bm.hasChildren()) {
+                List<Bookmark> children = bm.children();
+                for (int i = children.size() - 1; i >= 0; i--) {
+                    stack.push(children.get(i));
+                }
+            }
+        }
+        if (processed >= maxNodes) {
+            log.warn(
+                    "Source bookmark traversal hit {}-node cap; remaining bookmarks dropped",
+                    maxNodes);
+        }
+    }
 }

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/AttachmentController.java

@@ -35,6 +35,8 @@ import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
+import stirling.software.jpdfium.PdfDocument;
+import stirling.software.jpdfium.doc.Attachment;
 
 @MiscApi
 @Slf4j
@@ -60,6 +62,7 @@ public class AttachmentController {
                     "This endpoint adds attachments to a PDF. Input:PDF, Output:PDF Type:MISO")
     public ResponseEntity<Resource> addAttachments(@ModelAttribute AddAttachmentRequest request)
             throws Exception {
+        // Hybrid: JPDFium add lacks viewer prefs, content-type and dates; PDFBox preserves them.
         MultipartFile fileInput = request.getFileInput();
         List<MultipartFile> attachments = request.getAttachments();
         boolean convertToPdfA3b = request.isConvertToPdfA3b();
@@ -149,6 +152,7 @@ public class AttachmentController {
                             + " Input:PDF Output:ZIP Type:SISO")
     public ResponseEntity<Resource> extractAttachments(
             @ModelAttribute ExtractAttachmentsRequest request) throws IOException {
+        // Hybrid: PDFBox preserves embedded-file dates/description on ZIP entries.
         try (PDDocument document = pdfDocumentFactory.load(request, true)) {
             Optional<byte[]> extracted = pdfAttachmentService.extractAttachments(document);
 
@@ -183,6 +187,7 @@ public class AttachmentController {
                     "This endpoint lists all embedded attachments in a PDF. Input:PDF Output:JSON Type:SISO")
     public ResponseEntity<List<stirling.software.SPDF.model.api.misc.AttachmentInfo>>
             listAttachments(@ModelAttribute ListAttachmentsRequest request) throws IOException {
+        // Hybrid: PDFBox preserves content-type/description/dates that JPDFium's record lacks.
         try (PDDocument document = pdfDocumentFactory.load(request, true)) {
             List<stirling.software.SPDF.model.api.misc.AttachmentInfo> attachments =
                     pdfAttachmentService.listAttachments(document);
@@ -201,6 +206,7 @@ public class AttachmentController {
                     "This endpoint renames an embedded attachment in a PDF. Input:PDF Output:PDF Type:MISO")
     public ResponseEntity<Resource> renameAttachment(
             @ModelAttribute RenameAttachmentRequest request) throws Exception {
+        // Hybrid: JPDFium has no rename API; PDFBox edits the embedded-files name tree directly.
         MultipartFile fileInput = request.getFileInput();
         String attachmentName = request.getAttachmentName();
         String newName = request.getNewName();
@@ -236,6 +242,7 @@ public class AttachmentController {
                     "This endpoint deletes an embedded attachment from a PDF. Input:PDF Output:PDF Type:MISO")
     public ResponseEntity<Resource> deleteAttachment(
             @ModelAttribute DeleteAttachmentRequest request) throws Exception {
+        // JPDFium: locate by name then delete via FPDFDoc_DeleteAttachment(index).
         MultipartFile fileInput = request.getFileInput();
         String attachmentName = request.getAttachmentName();
 
@@ -244,15 +251,50 @@ public class AttachmentController {
                     "error.attachmentNameRequired", "Attachment name cannot be null or empty");
         }
 
-        try (PDDocument document = pdfDocumentFactory.load(request, false)) {
-            pdfAttachmentService.deleteAttachment(document, attachmentName);
+        TempFile inputTemp = new TempFile(tempFileManager, ".pdf");
+        TempFile tempOut = null;
+        try {
+            fileInput.transferTo(inputTemp.getFile());
 
-            return WebResponseUtils.pdfDocToWebResponse(
-                    document,
+            try (PdfDocument doc = PdfDocument.open(inputTemp.getPath())) {
+                int matchIndex = -1;
+                List<Attachment> existing = doc.attachments();
+                for (Attachment att : existing) {
+                    if (attachmentName.equals(att.name())) {
+                        matchIndex = att.index();
+                        break;
+                    }
+                }
+
+                if (matchIndex < 0) {
+                    log.warn("Attachment '{}' not found for deletion", attachmentName);
+                    throw ExceptionUtils.createIllegalArgumentException(
+                            "error.attachmentNotFound",
+                            "Attachment ''{0}'' not found for deletion",
+                            attachmentName);
+                }
+
+                if (!doc.deleteAttachment(matchIndex)) {
+                    throw new IOException("Failed to delete attachment '" + attachmentName + "'");
+                }
+
+                tempOut = tempFileManager.createManagedTempFile(".pdf");
+                doc.save(tempOut.getPath());
+                log.info("Deleted attachment: '{}'", attachmentName);
+            }
+
+            return WebResponseUtils.pdfFileToWebResponse(
+                    tempOut,
                     GeneralUtils.generateFilename(
                             Filenames.toSimpleFileName(fileInput.getOriginalFilename()),
-                            "_attachment_deleted.pdf"),
-                    tempFileManager);
+                            "_attachment_deleted.pdf"));
+        } catch (RuntimeException | IOException e) {
+            if (tempOut != null) {
+                tempOut.close();
+            }
+            throw e;
+        } finally {
+            inputTemp.close();
         }
     }
 }

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/RemoveImagesController.java

@@ -1,17 +1,8 @@
 package stirling.software.SPDF.controller.api.misc;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.foreign.MemorySegment;
 
-import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.graphics.PDXObject;
-import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -27,19 +18,20 @@ import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.enumeration.ResourceWeight;
 import stirling.software.common.model.api.PDFFile;
-import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
+import stirling.software.jpdfium.PdfDocument;
+import stirling.software.jpdfium.PdfPage;
+import stirling.software.jpdfium.doc.PdfPageEditor;
 
 @GeneralApi
 @Slf4j
 @RequiredArgsConstructor
 public class RemoveImagesController {
 
-    private final CustomPDFDocumentFactory pdfDocumentFactory;
     private final TempFileManager tempFileManager;
 
     @AutoJobPostMapping(
@@ -56,93 +48,66 @@ public class RemoveImagesController {
 
         MultipartFile inputFile = request.getFileInput();
 
-        try (PDDocument pdfDoc = pdfDocumentFactory.load(request)) {
+        TempFile inputTemp = new TempFile(tempFileManager, ".pdf");
+        try {
+            inputFile.transferTo(inputTemp.getFile());
 
-            int totalPages = pdfDoc.getNumberOfPages();
             int imagesRemoved = 0;
+            int totalPages;
 
-            for (int pageIndex = 0; pageIndex < totalPages; pageIndex++) {
-                PDPage currentPage = pdfDoc.getPage(pageIndex);
-                imagesRemoved += removeImagesFromPage(currentPage);
+            try (PdfDocument doc = PdfDocument.open(inputTemp.getPath())) {
+                totalPages = doc.pageCount();
+                for (int pageIndex = 0; pageIndex < totalPages; pageIndex++) {
+                    try (PdfPage page = doc.page(pageIndex)) {
+                        imagesRemoved += removeImagesFromPage(page);
+                    }
+                }
+
+                TempFile tempOut = tempFileManager.createManagedTempFile(".pdf");
+                try {
+                    doc.save(tempOut.getPath());
+                } catch (RuntimeException e) {
+                    tempOut.close();
+                    throw e;
+                }
+
+                log.info("Removed {} images from PDF with {} pages", imagesRemoved, totalPages);
+
+                return WebResponseUtils.pdfFileToWebResponse(
+                        tempOut,
+                        GeneralUtils.generateFilename(
+                                inputFile.getOriginalFilename(), "_images_removed.pdf"));
             }
-
-            log.info("Removed {} images from PDF with {} pages", imagesRemoved, totalPages);
-
-            TempFile tempOut = tempFileManager.createManagedTempFile(".pdf");
-            try {
-                pdfDoc.save(tempOut.getFile());
-            } catch (IOException e) {
-                tempOut.close();
-                throw e;
-            }
-
-            return WebResponseUtils.pdfFileToWebResponse(
-                    tempOut,
-                    GeneralUtils.generateFilename(
-                            inputFile.getOriginalFilename(), "_images_removed.pdf"));
-
+        } catch (RuntimeException e) {
+            throw ExceptionUtils.handlePdfException(new IOException(e), "during image removal");
         } catch (IOException e) {
             throw ExceptionUtils.handlePdfException(e, "during image removal");
+        } finally {
+            inputTemp.close();
         }
     }
 
-    private int removeImagesFromPage(PDPage page) throws IOException {
-        int imagesRemoved = 0;
-
-        PDResources resources = page.getResources();
-        if (resources == null) {
-            return imagesRemoved;
-        }
-
-        imagesRemoved += removeImagesFromResources(resources);
-        return imagesRemoved;
-    }
-
-    private int removeImagesFromFormXObject(PDFormXObject formXObject) throws IOException {
-        PDResources resources = formXObject.getResources();
-        if (resources == null) {
-            return 0;
-        }
-
-        return removeImagesFromResources(resources);
-    }
-
-    private int removeImagesFromResources(PDResources resources) throws IOException {
-        if (resources == null) {
-            return 0;
-        }
-
-        COSDictionary xObjects = resources.getCOSObject().getCOSDictionary(COSName.XOBJECT);
-        if (xObjects == null) {
-            return 0;
-        }
-
-        int imagesRemoved = 0;
-        // Create snapshot to safely iterate while removing
-        List<COSName> names = new ArrayList<>(xObjects.keySet());
-
-        for (COSName name : names) {
-            try {
-                PDXObject xObject = resources.getXObject(name);
-                if (xObject == null) {
-                    continue;
+    // Remove all IMAGE-typed page objects from a single page using JPDFium's editor APIs.
+    private int removeImagesFromPage(PdfPage page) {
+        MemorySegment pageHandle = page.rawHandle();
+        int removed = 0;
+        // Iterate in reverse so index shifts don't skip elements after removal.
+        int count = PdfPageEditor.countObjects(pageHandle);
+        for (int i = count - 1; i >= 0; i--) {
+            MemorySegment obj = PdfPageEditor.getObject(pageHandle, i);
+            if (obj == null) {
+                continue;
+            }
+            int type = PdfPageEditor.getObjectType(obj);
+            if (type == PdfPageEditor.PAGEOBJ_IMAGE) {
+                if (PdfPageEditor.removeObject(pageHandle, obj)) {
+                    removed++;
                 }
-
-                // Remove direct images
-                if (xObject instanceof PDImageXObject) {
-                    xObjects.removeItem(name);
-                    imagesRemoved++;
-                    log.debug("Removed image: {}", name.getName());
-                }
-                // Recursively process nested form XObjects
-                else if (xObject instanceof PDFormXObject form) {
-                    imagesRemoved += removeImagesFromResources(form.getResources());
-                }
-            } catch (IOException e) {
-                log.warn("Error processing XObject {}: {}", name.getName(), e.getMessage());
             }
         }
-
-        return imagesRemoved;
+        if (removed > 0) {
+            PdfPageEditor.generateContent(pageHandle);
+        }
+        return removed;
     }
 }

app/core/src/test/java/stirling/software/SPDF/controller/api/misc/AttachmentControllerTest.java

@@ -1,18 +1,31 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
+import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
+import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockedStatic;
@@ -26,6 +39,7 @@ import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 import stirling.software.SPDF.model.api.misc.AddAttachmentRequest;
+import stirling.software.SPDF.model.api.misc.DeleteAttachmentRequest;
 import stirling.software.SPDF.service.AttachmentServiceInterface;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.TempFile;
@@ -38,13 +52,7 @@ class AttachmentControllerTest {
         return ResponseEntity.ok(new ByteArrayResource(bytes));
     }
 
-    private static byte[] drainBody(ResponseEntity<Resource> response) throws java.io.IOException {
-        java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
-        try (java.io.InputStream __in = response.getBody().getInputStream()) {
-            __in.transferTo(baos);
-        }
-        return baos.toByteArray();
-    }
+    @TempDir Path tempDir;
 
     @Mock private CustomPDFDocumentFactory pdfDocumentFactory;
 
@@ -62,12 +70,19 @@ class AttachmentControllerTest {
 
     @BeforeEach
     void setUp() throws Exception {
+        lenient()
+                .when(tempFileManager.createTempFile(anyString()))
+                .thenAnswer(
+                        inv ->
+                                Files.createTempFile(tempDir, "input", inv.<String>getArgument(0))
+                                        .toFile());
         lenient()
                 .when(tempFileManager.createManagedTempFile(anyString()))
                 .thenAnswer(
                         inv -> {
                             File f =
-                                    Files.createTempFile("test", inv.<String>getArgument(0))
+                                    Files.createTempFile(
+                                                    tempDir, "managed", inv.<String>getArgument(0))
                                             .toFile();
                             TempFile tf = mock(TempFile.class);
                             lenient().when(tf.getFile()).thenReturn(f);
@@ -188,4 +203,93 @@ class AttachmentControllerTest {
         assertThrows(IOException.class, () -> attachmentController.addAttachments(request));
         verify(pdfAttachmentService).addAttachment(mockDocument, attachments);
     }
+
+    // Build a PDF with one embedded attachment using PDFBox so JPDFium can read it back.
+    private byte[] buildPdfWithAttachment(String attachmentName, byte[] attachmentBytes)
+            throws IOException {
+        Path path = tempDir.resolve("with-attachment.pdf");
+        try (PDDocument doc = new PDDocument()) {
+            doc.addPage(new PDPage(PDRectangle.LETTER));
+
+            PDComplexFileSpecification spec = new PDComplexFileSpecification();
+            spec.setFile(attachmentName);
+            spec.setFileUnicode(attachmentName);
+
+            PDEmbeddedFile embedded =
+                    new PDEmbeddedFile(doc, new ByteArrayInputStream(attachmentBytes));
+            embedded.setSize(attachmentBytes.length);
+            spec.setEmbeddedFile(embedded);
+            spec.setEmbeddedFileUnicode(embedded);
+
+            PDDocumentCatalog catalog = doc.getDocumentCatalog();
+            PDDocumentNameDictionary names = new PDDocumentNameDictionary(catalog);
+            PDEmbeddedFilesNameTreeNode tree = new PDEmbeddedFilesNameTreeNode();
+            tree.setNames(java.util.Map.of(attachmentName, spec));
+            names.setEmbeddedFiles(tree);
+            catalog.setNames(names);
+
+            doc.save(path.toFile());
+        }
+        return Files.readAllBytes(path);
+    }
+
+    private int countAttachmentsInPdf(byte[] pdfBytes) throws IOException {
+        try (PDDocument doc = Loader.loadPDF(pdfBytes)) {
+            PDDocumentCatalog catalog = doc.getDocumentCatalog();
+            if (catalog == null || catalog.getNames() == null) {
+                return 0;
+            }
+            PDEmbeddedFilesNameTreeNode tree = catalog.getNames().getEmbeddedFiles();
+            if (tree == null || tree.getNames() == null) {
+                return 0;
+            }
+            return tree.getNames().size();
+        }
+    }
+
+    @Test
+    void deleteAttachment_removesNamedAttachment() throws Exception {
+        byte[] pdfBytes = buildPdfWithAttachment("to_delete.txt", "payload".getBytes());
+        assertEquals(1, countAttachmentsInPdf(pdfBytes));
+
+        MockMultipartFile input =
+                new MockMultipartFile(
+                        "fileInput", "doc.pdf", MediaType.APPLICATION_PDF_VALUE, pdfBytes);
+        DeleteAttachmentRequest req = new DeleteAttachmentRequest();
+        req.setFileInput(input);
+        req.setAttachmentName("to_delete.txt");
+
+        ResponseEntity<Resource> response = attachmentController.deleteAttachment(req);
+        assertNotNull(response);
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+
+        try (InputStream in = response.getBody().getInputStream()) {
+            byte[] outBytes = in.readAllBytes();
+            assertThat(countAttachmentsInPdf(outBytes)).isZero();
+        }
+    }
+
+    @Test
+    void deleteAttachment_missingName_throws() {
+        DeleteAttachmentRequest req = new DeleteAttachmentRequest();
+        req.setFileInput(pdfFile);
+        req.setAttachmentName("");
+
+        assertThrows(
+                IllegalArgumentException.class, () -> attachmentController.deleteAttachment(req));
+    }
+
+    @Test
+    void deleteAttachment_notFound_throws() throws Exception {
+        byte[] pdfBytes = buildPdfWithAttachment("present.txt", "stuff".getBytes());
+        MockMultipartFile input =
+                new MockMultipartFile(
+                        "fileInput", "doc.pdf", MediaType.APPLICATION_PDF_VALUE, pdfBytes);
+        DeleteAttachmentRequest req = new DeleteAttachmentRequest();
+        req.setFileInput(input);
+        req.setAttachmentName("does_not_exist.txt");
+
+        assertThrows(
+                IllegalArgumentException.class, () -> attachmentController.deleteAttachment(req));
+    }
 }

app/core/src/test/java/stirling/software/SPDF/controller/api/misc/RemoveImagesControllerTest.java

@@ -0,0 +1,193 @@
+package stirling.software.SPDF.controller.api.misc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.mock;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.PDXObject;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.mock.web.MockMultipartFile;
+
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.util.TempFile;
+import stirling.software.common.util.TempFileManager;
+
+@ExtendWith(MockitoExtension.class)
+class RemoveImagesControllerTest {
+
+    @TempDir Path tempDir;
+
+    @Mock private TempFileManager tempFileManager;
+
+    @InjectMocks private RemoveImagesController controller;
+
+    private void wireTempFileManager() throws IOException {
+        lenient()
+                .when(tempFileManager.createTempFile(anyString()))
+                .thenAnswer(
+                        inv -> Files.createTempFile(tempDir, "test", inv.getArgument(0)).toFile());
+        lenient()
+                .when(tempFileManager.createManagedTempFile(anyString()))
+                .thenAnswer(
+                        inv -> {
+                            File f =
+                                    Files.createTempFile(tempDir, "managed", inv.getArgument(0))
+                                            .toFile();
+                            TempFile tf = mock(TempFile.class);
+                            lenient().when(tf.getFile()).thenReturn(f);
+                            lenient().when(tf.getPath()).thenReturn(f.toPath());
+                            return tf;
+                        });
+    }
+
+    private MockMultipartFile createPdfWithImages(int imagesPerPage, int pages) throws IOException {
+        Path path = tempDir.resolve("with-images.pdf");
+        try (PDDocument doc = new PDDocument()) {
+            for (int p = 0; p < pages; p++) {
+                PDPage page = new PDPage(PDRectangle.LETTER);
+                doc.addPage(page);
+                try (PDPageContentStream cs = new PDPageContentStream(doc, page)) {
+                    for (int i = 0; i < imagesPerPage; i++) {
+                        BufferedImage img = new BufferedImage(20, 20, BufferedImage.TYPE_INT_RGB);
+                        PDImageXObject pdImage = JPEGFactory.createFromImage(doc, img);
+                        cs.drawImage(pdImage, 50f + i * 30, 600f, 25f, 25f);
+                    }
+                }
+            }
+            doc.save(path.toFile());
+        }
+        return new MockMultipartFile(
+                "fileInput",
+                "with-images.pdf",
+                MediaType.APPLICATION_PDF_VALUE,
+                Files.readAllBytes(path));
+    }
+
+    private MockMultipartFile createTextOnlyPdf(int pages) throws IOException {
+        Path path = tempDir.resolve("text-only.pdf");
+        try (PDDocument doc = new PDDocument()) {
+            for (int p = 0; p < pages; p++) {
+                doc.addPage(new PDPage(PDRectangle.LETTER));
+            }
+            doc.save(path.toFile());
+        }
+        return new MockMultipartFile(
+                "fileInput",
+                "text-only.pdf",
+                MediaType.APPLICATION_PDF_VALUE,
+                Files.readAllBytes(path));
+    }
+
+    // PDFBox oracle: walk every page (and nested forms) and count remaining image XObjects.
+    private int countImagesInDocument(byte[] pdfBytes) throws IOException {
+        try (PDDocument doc = Loader.loadPDF(pdfBytes)) {
+            int total = 0;
+            for (PDPage page : doc.getPages()) {
+                total += countImagesInResources(page.getResources());
+            }
+            return total;
+        }
+    }
+
+    private int countImagesInResources(PDResources resources) throws IOException {
+        if (resources == null) {
+            return 0;
+        }
+        int count = 0;
+        for (COSName name : resources.getXObjectNames()) {
+            PDXObject xo = resources.getXObject(name);
+            if (xo instanceof PDImageXObject) {
+                count++;
+            } else if (xo instanceof PDFormXObject form) {
+                count += countImagesInResources(form.getResources());
+            }
+        }
+        return count;
+    }
+
+    @Test
+    void removeImages_withImages_strippedOnRender() throws IOException {
+        wireTempFileManager();
+        MockMultipartFile file = createPdfWithImages(2, 2);
+        PDFFile request = new PDFFile();
+        request.setFileInput(file);
+
+        int before = countImagesInDocument(file.getBytes());
+        assertThat(before).isEqualTo(4);
+
+        ResponseEntity<Resource> response = controller.removeImages(request);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+
+        try (InputStream in = response.getBody().getInputStream()) {
+            byte[] outBytes = in.readAllBytes();
+            try (PDDocument out = Loader.loadPDF(outBytes)) {
+                assertThat(out.getNumberOfPages()).isEqualTo(2);
+                for (PDPage page : out.getPages()) {
+                    int residualOnPage = countImagesInResources(page.getResources());
+                    assertThat(residualOnPage).isZero();
+                }
+            }
+        }
+    }
+
+    @Test
+    void removeImages_textOnlyPdf_returnsValidPdf() throws IOException {
+        wireTempFileManager();
+        MockMultipartFile file = createTextOnlyPdf(3);
+        PDFFile request = new PDFFile();
+        request.setFileInput(file);
+
+        ResponseEntity<Resource> response = controller.removeImages(request);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+
+        try (InputStream in = response.getBody().getInputStream()) {
+            byte[] outBytes = in.readAllBytes();
+            try (PDDocument out = Loader.loadPDF(outBytes)) {
+                assertThat(out.getNumberOfPages()).isEqualTo(3);
+            }
+        }
+    }
+
+    @Test
+    void removeImages_corruptedInput_throws() throws IOException {
+        wireTempFileManager();
+        MockMultipartFile bad =
+                new MockMultipartFile(
+                        "fileInput",
+                        "broken.pdf",
+                        MediaType.APPLICATION_PDF_VALUE,
+                        "not a real pdf".getBytes());
+        PDFFile request = new PDFFile();
+        request.setFileInput(bad);
+
+        assertThatThrownBy(() -> controller.removeImages(request)).isInstanceOf(IOException.class);
+    }
+}

build.gradle

@@ -31,12 +31,12 @@ ext {
     googleJavaFormatVersion = "1.28.0"
     logback = "1.5.32"
     // junit-platform-launcher version managed by Spring Boot BOM
-    modernJavaVersion = 21
+    modernJavaVersion = 25
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
     toolchain {
         languageVersion = JavaLanguageVersion.of(project.findProperty('javaVersion')?.toString() ?: '25')
     }
@@ -158,8 +158,8 @@ subprojects {
     apply plugin: 'jacoco'
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_25
+        targetCompatibility = JavaVersion.VERSION_25
         toolchain {
             languageVersion = JavaLanguageVersion.of(25)
         }
@@ -444,7 +444,8 @@ subprojects {
                 "-XX:G1HeapRegionSize=4m",
                 "-XX:+ExplicitGCInvokesConcurrent",
                 "-XX:+UseStringDeduplication",
-                "-XX:+UseCompactObjectHeaders"
+                "-XX:+UseCompactObjectHeaders",
+                "--enable-native-access=ALL-UNNAMED"
             ]
         }
     }

frontend/scripts/sign-jpdfium-dylibs-in-bootjar.sh

@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+# Sign every .dylib inside the bootJar's JPDFium native jars.
+# Requires APPLE_SIGNING_IDENTITY set to a Developer ID identity in the keychain.
+#
+# Usage: sign-jpdfium-dylibs-in-bootjar.sh [path/to/stirling-pdf-*.jar]
+
+set -u
+
+echo "sign-jpdfium-dylibs-in-bootjar.sh: start  ($(uname -s) $(uname -m))"
+
+case "$(uname -s)" in
+    Darwin*) ;;
+    *) echo "Not macOS, skipping"; exit 0;;
+esac
+
+if [ -z "${APPLE_SIGNING_IDENTITY:-}" ]; then
+    echo "APPLE_SIGNING_IDENTITY not set; skipping"
+    exit 0
+fi
+if ! command -v codesign >/dev/null 2>&1; then
+    echo "codesign not on PATH; skipping"
+    exit 0
+fi
+if ! command -v jar >/dev/null 2>&1; then
+    echo "jar not on PATH (need a JDK setup-action earlier); skipping"
+    exit 0
+fi
+
+BOOTJARS=()
+if [ -n "${1:-}" ]; then
+    BOOTJARS+=("$1")
+else
+    for cand in app/core/build/libs/stirling-pdf-*.jar \
+                frontend/src-tauri/libs/stirling-pdf-*.jar; do
+        [ -f "$cand" ] || continue
+        BOOTJARS+=("$cand")
+    done
+fi
+if [ "${#BOOTJARS[@]:-0}" = 0 ]; then
+    echo "bootJar not found (expected app/core/build/libs/stirling-pdf-*.jar" \
+         "or frontend/src-tauri/libs/stirling-pdf-*.jar)"
+    exit 0
+fi
+
+for BOOTJAR in "${BOOTJARS[@]}"; do
+    BOOTJAR=$(cd "$(dirname "$BOOTJAR")" && pwd)/$(basename "$BOOTJAR")
+    echo ""
+    echo "=== Target bootJar: $BOOTJAR ($(du -h "$BOOTJAR" | cut -f1)) ==="
+
+    WORK=$(mktemp -d)
+    # shellcheck disable=SC2064
+    trap "rm -rf '$WORK'" EXIT
+
+    NATIVE_JAR_PATHS=()
+    while IFS= read -r line; do
+        [ -n "$line" ] || continue
+        NATIVE_JAR_PATHS+=("$line")
+    done < <(jar tf "$BOOTJAR" \
+        | grep -E '^BOOT-INF/lib/jpdfium-natives-darwin-(x64|arm64)-.*\.jar$' || true)
+
+    if [ "${#NATIVE_JAR_PATHS[@]:-0}" = 0 ]; then
+        echo "  No JPDFium darwin natives in this bootJar; skipping"
+        rm -rf "$WORK"
+        continue
+    fi
+
+    ( cd "$WORK" && jar xf "$BOOTJAR" ${NATIVE_JAR_PATHS[@]+"${NATIVE_JAR_PATHS[@]}"} ) \
+        || { echo "jar xf failed to extract natives jars" >&2; exit 1; }
+
+    ANY_SIGNED=0
+    for nat_jar in "$WORK/BOOT-INF/lib"/jpdfium-natives-darwin-*.jar; do
+        [ -f "$nat_jar" ] || continue
+        base=$(basename "$nat_jar")
+        echo "  Processing $base"
+
+        exp_dir="$WORK/${base%.jar}.expanded"
+        mkdir -p "$exp_dir"
+        ( cd "$exp_dir" && jar xf "$nat_jar" )
+
+        signed=0
+        while IFS= read -r dylib; do
+            codesign --force --sign "$APPLE_SIGNING_IDENTITY" \
+                     --options runtime --timestamp "$dylib" 2>&1 | sed 's/^/      /'
+            signed=$((signed + 1))
+        done < <(find "$exp_dir" -name '*.dylib' -type f)
+
+        if [ "$signed" = 0 ]; then
+            echo "    (no .dylibs found)"
+            continue
+        fi
+        echo "    signed $signed dylib(s)"
+
+        rm -f "$nat_jar"
+        ( cd "$exp_dir" && jar cfM0 "$nat_jar" . )
+        ANY_SIGNED=1
+    done
+
+    if [ "$ANY_SIGNED" = 0 ]; then
+        echo "  No .dylibs signed; skipping update"
+        rm -rf "$WORK"
+        continue
+    fi
+
+    ( cd "$WORK" && jar uf "$BOOTJAR" \
+        BOOT-INF/lib/jpdfium-natives-darwin-x64-*.jar \
+        BOOT-INF/lib/jpdfium-natives-darwin-arm64-*.jar ) \
+        2>/dev/null || { echo "jar uf failed" >&2; exit 1; }
+
+    echo "  Updated: $BOOTJAR ($(du -h "$BOOTJAR" | cut -f1))"
+    rm -rf "$WORK"
+done

testing/test.sh

@@ -442,8 +442,10 @@ compare_file_lists() {
             echo "New files created during test:"
             cat "${diff_file}.added" | sed 's/^> //'
 
-            # Check for tmp files
-            grep -i "tmp\|temp" "${diff_file}.added" > "${diff_file}.tmp" || true
+            # Exclude JPDFium native cache (deleteOnExit-registered, not a leak).
+            grep -i "tmp\|temp" "${diff_file}.added" \
+                | grep -v '/jpdfium-[0-9]\+/' \
+                > "${diff_file}.tmp" || true
             if [ -s "${diff_file}.tmp" ]; then
                 echo "WARNING: Temporary files detected:"
                 cat "${diff_file}.tmp"