Update build.gradle

.github/workflows/build.yml

@@ -141,4 +141,4 @@ jobs:
         run: |
           chmod +x ./testing/test_webpages.sh
           chmod +x ./testing/test.sh
-          ./testing/test.sh
+          ./testing/test.sh "${{ github.event.pull_request.user.login == 'dependabot[bot]' }}"

.github/workflows/sonarqube.yml

@@ -31,6 +31,20 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
+      - name: Cache SonarCloud packages
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Cache Gradle packages
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+
       - name: Build and analyze with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sync_files.yml

@@ -111,11 +111,11 @@ jobs:
           author: ${{ needs.read_bot_entries.outputs.committer }}
           signoff: true
           branch: sync_readme
-          title: ":globe_with_meridians: Sync Translations + Update README Progress Table"
+          title: ":globe_with_meridians: Sync Translations + Update README Progress Table + Update Verification Metadata"
           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:
+            This Pull Request was automatically generated to synchronize updates to translation files, verification metadata, 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`.

Dockerfile

@@ -56,8 +56,6 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         openssl-dev \
         openjdk21-jre \
 # Doc conversion
-		gcompat \
-    	libc6-compat \
         libreoffice \
 # pdftohtml
         poppler-utils \

Dockerfile.fat

@@ -57,8 +57,6 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         openssl-dev \
         openjdk21-jre \
 # Doc conversion
-		gcompat \
-    	libc6-compat \
         libreoffice \
 # pdftohtml
         poppler-utils \

build.gradle

@@ -8,7 +8,7 @@ plugins {
     id "com.diffplug.spotless" version "7.0.2"
     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.panteleyev.jpackageplugin") version "1.6.0"
     id "org.sonarqube" version "6.0.1.5171"
 }
 

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

@@ -265,6 +265,9 @@ public class EndpointConfiguration {
         // Pdftohtml dependent endpoints
         addEndpointToGroup("Pdftohtml", "pdf-to-html");
         addEndpointToGroup("Pdftohtml", "pdf-to-markdown");
+
+        // disabled for now while we resolve issues
+        disableEndpoint("pdf-to-pdfa");
     }
 
     private void processEnvironmentConfigs() {

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java

@@ -73,8 +73,8 @@ public class ConvertPDFToPDFA {
             // Determine PDF/A filter based on requested format
             String pdfFilter =
                     "pdfa".equals(outputFormat)
-                            ? "pdf:writer_pdf_Export:{\"SelectPdfVersion\":{\"type\":\"long\",\"value\":\"2\"}}"
-                            : "pdf:writer_pdf_Export:{\"SelectPdfVersion\":{\"type\":\"long\",\"value\":\"1\"}}";
+                            ? "writer_pdf_Export:{'SelectPdfVersion':{'Value':'2'}}:writer_pdf_Export"
+                            : "writer_pdf_Export:{'SelectPdfVersion':{'Value':'1'}}:writer_pdf_Export";
 
             // Prepare LibreOffice command
             List<String> command =
@@ -84,7 +84,7 @@ public class ConvertPDFToPDFA {
                                     "--headless",
                                     "--nologo",
                                     "--convert-to",
-                                    pdfFilter,
+                                    "pdf:" + pdfFilter,
                                     "--outdir",
                                     tempOutputDir.toString(),
                                     tempInputFile.toString()));

src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java

@@ -218,9 +218,6 @@ public class ProcessExecutor {
             errorReaderThread.join();
             outputReaderThread.join();
 
-            boolean isQpdf =
-                    command != null && !command.isEmpty() && command.get(0).contains("qpdf");
-
             if (outputLines.size() > 0) {
                 String outputMessage = String.join("\n", outputLines);
                 messages += outputMessage;
@@ -236,9 +233,6 @@ public class ProcessExecutor {
                     log.warn("Command error output:\n" + errorMessage);
                 }
                 if (exitCode != 0) {
-                    if (isQpdf && exitCode == 3) {
-                        log.warn("qpdf succeeded with warnings: {}", messages);
-                    } else {
                     throw new IOException(
                             "Command process failed with exit code "
                                     + exitCode
@@ -246,19 +240,14 @@ public class ProcessExecutor {
                                     + errorMessage);
                 }
             }
-            }
 
             if (exitCode != 0) {
-                if (isQpdf && exitCode == 3) {
-                    log.warn("qpdf succeeded with warnings: {}", messages);
-                } else {
                 throw new IOException(
                         "Command process failed with exit code "
                                 + exitCode
                                 + "\nLogs: "
                                 + messages);
             }
-            }
         } finally {
             semaphore.release();
         }

src/main/resources/messages_en_GB.properties

@@ -1185,7 +1185,7 @@ changeMetadata.submit=Change
 #pdfToPDFA
 pdfToPDFA.title=PDF To PDF/A
 pdfToPDFA.header=PDF To PDF/A
-pdfToPDFA.credit=This service uses libreoffice for PDF/A conversion
+pdfToPDFA.credit=This service uses qpdf for PDF/A conversion
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format

src/main/resources/messages_en_US.properties

@@ -1185,7 +1185,7 @@ changeMetadata.submit=Change
 #pdfToPDFA
 pdfToPDFA.title=PDF To PDF/A
 pdfToPDFA.header=PDF To PDF/A
-pdfToPDFA.credit=This service uses libreoffice for PDF/A conversion
+pdfToPDFA.credit=This service uses qpdf for PDF/A conversion
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format

src/main/resources/templates/fragments/navElements.html

@@ -1,6 +1,7 @@
 <th:block th:fragment="navElements">
     <div id="groupOrganize" class="feature-group">
-    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.organize})}">
+      <div
+        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.organize})}">
       </div>
       <div class="nav-group-container">
         <div
@@ -11,8 +12,7 @@
         th:replace="~{fragments/navbarEntry :: navbarEntry ('merge-pdfs', 'add_to_photos', 'home.merge.title', 'home.merge.desc', 'merge.tags', 'organize')}">
         </div>
         <div
-        th:replace="~{fragments/navbarEntry :: navbarEntry ('split-pdfs', 'cut', 'home.split.title', 'home.split.desc', 'split.tags', 'organize')}">
-      </div>
+        th:replace="~{fragments/navbarEntry :: navbarEntry ('split-pdfs', 'cut', 'home.split.title', 'home.split.desc', 'split.tags', 'organize')}"></div>
         <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('rotate-pdf', 'rotate_right', 'home.rotate.title', 'home.rotate.desc', 'rotate.tags', 'organize')}">
       </div>
@@ -41,7 +41,8 @@
     </div>
 
     <div id="groupConvertTo"  class="feature-group">
-    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertTo})}">
+      <div
+        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertTo})}">
       </div>
       <div class="nav-group-container">
         <div
@@ -65,7 +66,8 @@
       </div>
     </div>
     <div id="groupConvertFrom" class="feature-group">
-    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertFrom})}">
+      <div
+        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertFrom})}">
       </div>
       <div class="nav-group-container">
         <div
@@ -102,7 +104,8 @@
     </div>
     </div>
     <div id="convertGroup"  class="feature-group">
-    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertTo})}">
+      <div
+        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertTo})}">
       </div>
       <div class="nav-group-container">
         <div
@@ -124,7 +127,8 @@
         th:replace="~{fragments/navbarEntry :: navbarEntry('book-to-pdf', 'book', 'home.BookToPDF.title', 'home.BookToPDF.desc', 'BookToPDF.tags', 'convertto')}">
       </div>
       </div>
-    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertFrom})}">
+      <div
+        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertFrom})}">
       </div>
       <div class="nav-group-container">
         <div
@@ -157,7 +161,8 @@
     </div>
     </div>
     <div id="groupSecurity" class="feature-group">
-    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.security})}">
+      <div
+        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.security})}">
       </div>
       <div class="nav-group-container">
         <div
@@ -181,22 +186,22 @@
     </div>
   <div
   th:replace="~{fragments/navbarEntry :: navbarEntry('remove-cert-sign', 'remove_moderator', 'home.removeCertSign.title', 'home.removeCertSign.desc', 'removeCertSign.tags', 'security')}">
-      </div>
-      <div
+</div>
+<div
   th:replace="~{fragments/navbarEntry :: navbarEntry('sanitize-pdf', 'sanitizer', 'home.sanitizePdf.title', 'home.sanitizePdf.desc', 'sanitizePdf.tags', 'security')}">
-      </div>
-      <div
+</div>
+<div
   th:replace="~{fragments/navbarEntryCustom :: navbarEntry('auto-redact', '/images/redact-auto.svg#icon-redact-auto', 'home.autoRedact.title', 'home.autoRedact.desc', 'autoRedact.tags', 'security')}">
-      </div>
-      <div
-        th:replace="~{fragments/navbarEntryCustom :: navbarEntry('redact', '/images/redact-manual.svg#icon-redact-manual', 'home.redact.title', 'home.redact.desc', 'redact.tags', 'security')}">
-      </div>
-      <div
+</div>
+<div
+th:replace="~{fragments/navbarEntryCustom :: navbarEntry('redact', '/images/redact-manual.svg#icon-redact-manual', 'home.redact.title', 'home.redact.desc', 'redact.tags', 'security')}">
+</div>
+<div
   th:replace="~{fragments/navbarEntry :: navbarEntry('stamp', 'approval', 'home.AddStampRequest.title', 'home.AddStampRequest.desc', 'AddStampRequest.tags', 'security')}">
-      </div>
-      <div
+</div>
+<div
   th:replace="~{fragments/navbarEntry :: navbarEntry('add-watermark', 'water_drop', 'home.watermark.title', 'home.watermark.desc', 'watermark.tags', 'security')}">
-      </div>
+</div>
       </div>
     </div>
 
@@ -241,12 +246,13 @@
         th:replace="~{fragments/navbarEntry :: navbarEntry('remove-image-pdf', 'remove_selection', 'home.removeImagePdf.title', 'home.removeImagePdf.desc', 'removeImagePdf.tags', 'other')}">
       </div>
       <div
-        th:replace="~{fragments/navbarEntry :: navbarEntry('replace-and-invert-color-pdf', 'format_color_fill', 'home.replaceColorPdf.title', 'home.replaceColorPdf.desc', 'replaceColorPdf.tags', 'other')}">
+        th:replace="~{fragments/navbarEntry :: navbarEntry('replace-color-pdf', 'format_color_fill', 'home.replaceColorPdf.title', 'home.replaceColorPdf.desc', 'replaceColorPdf.tags', 'other')}">
       </div>
       </div>
     </div>
     <div id="groupAdvanced" class="feature-group">
-    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.advance})}">
+      <div
+        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.advance})}">
       </div>
       <div class="nav-group-container">
         <div
@@ -287,4 +293,4 @@
       </div>
       </div>
   </div>
-</th:block>
+  </th:block>

src/main/resources/templates/home-legacy.html

@@ -27,13 +27,12 @@
         <span class="material-symbols-rounded search-icon">
           search
         </span>
-        <input type="text" id="searchBar" onkeyup="filterCardsLegacy()" th:placeholder="#{home.searchBar}" autofocus>
+        <input type="text" id="searchBar" onkeyup="filterCards()" th:placeholder="#{home.searchBar}" autofocus>
         <div style="display: flex; align-items: center;">
-          <a href="home" onclick="setAsDefault('home')"
-            style="text-decoration: none; color: inherit; cursor: pointer; display: flex; align-items: center;">
+        <a href="home" onclick="setAsDefault('home')" style="text-decoration: none; color: inherit; cursor: pointer; display: flex; align-items: center;">
           <span th:text="#{home.newHomePage}">
           </span>
-            <span class="material-symbols-rounded toggle-favourites" style="font-size: 2rem; margin-left: 0.2rem;">
+        <span class="material-symbols-rounded toggle-favourites"  style="font-size: 2rem; margin-left: 0.2rem;" >
           home
         </span>
         </a>
@@ -71,8 +70,7 @@
           </div>
 
           <div id="groupFavorites" class="feature-group-legacy">
-            <div
-              th:replace="~{fragments/featureGroupHeaderLegacy :: featureGroupHeader(groupTitle=#{navbar.favorite})}">
+            <div th:replace="~{fragments/featureGroupHeaderLegacy :: featureGroupHeader(groupTitle=#{navbar.favorite})}">
             </div>
             <div class="feature-group-container">
             </div>
@@ -250,8 +248,7 @@
           </div>
 
           <div id="groupView" class="feature-group-legacy">
-            <div
-              th:replace="~{fragments/featureGroupHeaderLegacy :: featureGroupHeader(groupTitle=#{navbar.sections.edit})}">
+            <div th:replace="~{fragments/featureGroupHeaderLegacy :: featureGroupHeader(groupTitle=#{navbar.sections.edit})}">
             </div>
             <div class="feature-group-container">
               <div
@@ -292,7 +289,7 @@
                 th:replace="~{fragments/card :: card(id='remove-image-pdf', cardTitle=#{home.removeImagePdf.title}, cardText=#{home.removeImagePdf.desc}, cardLink='remove-image-pdf', toolIcon='remove_selection', tags=#{removeImagePdf.tags}, toolGroup='other')}">
               </div>
               <div
-                th:replace="~{fragments/card :: card(id='replace-and-invert-color-pdf', cardTitle=#{home.replaceColorPdf.title}, cardText=#{home.replaceColorPdf.desc}, cardLink='replace-and-invert-color-pdf', toolIcon='format_color_fill', tags=#{replaceColorPdf.tags}, toolGroup='other')}">
+                th:replace="~{fragments/card :: card(id='replace-color-pdf', cardTitle=#{home.replaceColorPdf.title}, cardText=#{home.replaceColorPdf.desc}, cardLink='replace-and-invert-color-pdf', toolIcon='format_color_fill', tags=#{replaceColorPdf.tags}, toolGroup='other')}">
               </div>
 
             </div>

testing/test.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Default value for the Boolean parameter
+VERIFICATION=${1:-false}  # Default is "false" if no parameter is passed
+
 # Find project root by locating build.gradle
 find_root() {
     local dir="$PWD"
@@ -89,6 +92,7 @@ main() {
         exit 1
     fi
 
+
     # Building Docker images
     # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .
     docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .
@@ -107,8 +111,9 @@ main() {
 	cd "$PROJECT_ROOT"
 	docker-compose -f "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml" down
 	
-    # run_tests "Stirling-PDF" "./exampleYmlFiles/docker-compose-latest.yml"
-    # docker-compose -f "./exampleYmlFiles/docker-compose-latest.yml" down
+
+    #run_tests "Stirling-PDF" "./exampleYmlFiles/docker-compose-latest.yml"
+	#docker-compose -f "./exampleYmlFiles/docker-compose-latest.yml" down
 
     export DOCKER_ENABLE_SECURITY=true
     # Run the gradlew build command and check if it fails
@@ -117,6 +122,7 @@ main() {
         exit 1
     fi
 
+
     # Building Docker images with security enabled
    # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .
  #   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .
@@ -125,9 +131,9 @@ main() {
     
     # Test each configuration with security
   #  run_tests "Stirling-PDF-Ultra-Lite-Security" "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml"
-    # docker-compose -f "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml" down
+	#docker-compose -f "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml" down
   #  run_tests "Stirling-PDF-Security" "./exampleYmlFiles/docker-compose-latest-security.yml"
-    # docker-compose -f "./exampleYmlFiles/docker-compose-latest-security.yml" down
+#	docker-compose -f "./exampleYmlFiles/docker-compose-latest-security.yml" down
 
 
 	run_tests "Stirling-PDF-Security-Fat" "./exampleYmlFiles/docker-compose-latest-fat-security.yml"
@@ -144,6 +150,7 @@ main() {
 	
 	docker-compose -f "./exampleYmlFiles/docker-compose-latest-fat-security.yml" down
 
+
 	run_tests "Stirling-PDF-Security-Fat-with-login" "./exampleYmlFiles/test_cicd.yml"
 
 	if [ $? -eq 0 ]; then
@@ -179,6 +186,8 @@ main() {
         echo -e "\e[31m$test\e[0m"  # Red color for failed tests
     done
 
+
+
     # Check if there are any failed tests and exit with an error code if so
     if [ ${#failed_tests[@]} -ne 0 ]; then
         echo "Some tests failed."
@@ -187,6 +196,7 @@ main() {
         echo "All tests passed successfully."
         exit 0
     fi
+
 }
 
 main