Merge pull request #2463 from reecebrowne/bug/fix_merge

Add missing pdflib

build.gradle

@@ -23,11 +23,11 @@ ext {
     lombokVersion = "1.18.36"
     bouncycastleVersion = "1.79"
     springSecuritySamlVersion = "6.4.1"
-    openSamlVersion = "4.3.2"  
+    openSamlVersion = "4.3.2"
 }
 
 group = "stirling.software"
-version = "0.36.2"
+version = "0.36.3"
 
 
 java {
@@ -44,7 +44,7 @@ repositories {
     }
     maven { url "https://build.shibboleth.net/maven/releases" }
     maven { url "https://maven.pkg.github.com/jcefmaven/jcefmaven" }
-    
+
 }
 
 licenseReport {
@@ -68,12 +68,12 @@ sourceSets {
                 exclude "stirling/software/SPDF/model/User.java"
                 exclude "stirling/software/SPDF/repository/**"
             }
-            
+
             if (System.getenv("STIRLING_PDF_DESKTOP_UI") == "false") {
             	exclude "stirling/software/SPDF/UI/impl/**"
             }
-            
-            
+
+
         }
     }
 }
@@ -104,7 +104,7 @@ jpackage {
 
     icon = "src/main/resources/static/favicon.ico"
 
-    
+
 
     // JVM Options
     javaOptions = [
@@ -115,12 +115,12 @@ jpackage {
         "--add-opens", "java.base/java.lang=ALL-UNNAMED",
         "--add-opens", "java.desktop/java.awt.event=ALL-UNNAMED",
         "--add-opens", "java.desktop/sun.awt=ALL-UNNAMED"
-        
+
     ]
 
 
     verbose = true
-    
+
     destination = "${projectDir}/build/jpackage"
 
     // Windows-specific configuration
@@ -150,16 +150,16 @@ jpackage {
         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
     }
@@ -169,17 +169,17 @@ jpackage {
     	appVersion = project.version
         icon = "src/main/resources/static/favicon.png"
         type = "deb" // Can also use "rpm" for Red Hat-based systems
-        
+
         // Debian package configuration
         //linuxPackageName = "stirlingpdf"
         linuxDebMaintainer = "[email protected]"
         linuxMenuGroup = "Office;PDF;Productivity"
         linuxAppCategory = "Office"
         linuxAppRelease = "1"
         linuxPackageDeps = true
-        
+
         installDir = "/opt/Stirling-PDF"
-        
+
         // RPM-specific settings
         //linuxRpmLicenseType = "MIT"
     }
@@ -212,7 +212,7 @@ launch4j {
     icon = "${projectDir}/src/main/resources/static/favicon.ico"
 
     outfile="Stirling-PDF.exe"
-    
+
     if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
     	headerType = "gui"
     } else {
@@ -222,15 +222,15 @@ launch4j {
 
     errTitle="Encountered error, Do you have Java 21?"
     downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe"
-    
+
     if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
     	variables=["BROWSER_OPEN=true", "STIRLING_PDF_DESKTOP_UI=true"]
     } else {
     	variables=["BROWSER_OPEN=true"]
     }
-    
-    
-    
+
+
+
     jreMinVersion="17"
 
     mutexName="Stirling-PDF"
@@ -276,7 +276,7 @@ dependencies {
 	    implementation "org.openjfx:javafx-controls:21"
 	    implementation "org.openjfx:javafx-swing:21"
     }
-    
+
     //security updates
     implementation "org.springframework:spring-webmvc:6.2.0"
 
@@ -301,7 +301,7 @@ dependencies {
         implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
 
 		implementation "org.springframework.session:spring-session-core:$springBootVersion"
-				
+
 	    implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
         // Don't upgrade h2database
         runtimeOnly "com.h2database:h2:2.3.232"

src/main/resources/templates/merge-pdfs.html

@@ -5,6 +5,7 @@
 <head>
   <th:block th:insert="~{fragments/common :: head(title=#{merge.title}, header=#{merge.header})}"></th:block>
   <link rel="stylesheet" th:href="@{'/css/merge.css'}">
+  <script th:src="@{'/js/thirdParty/pdf-lib.min.js'}"></script>
 </head>
 
 <body>