Merge pull request #905 from OpenOlitor/dev/updateQRBill

updates SwissQRBill dependency

Author: AlwinEgger

.github/workflows/sbt-docker-prepublish.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   docker:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/sbt-docker-publish.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   docker:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v4

build.sbt

@@ -103,7 +103,7 @@ val buildSettings = Seq(
     // transitive dependencies of legacy de.zalando.beard
     "org.antlr"                    %  "antlr4"                             % "4.8-1",
     "io.monix"                     %% "monix"                              % "3.4.1", // ### Scala 3
-    "net.codecrete.qrbill"         %  "qrbill-generator"                   % "3.2.0",
+    "net.codecrete.qrbill"         %  "qrbill-generator"                   % "3.3.1",
     "io.nayuki"                    %  "qrcodegen"                          % "1.8.0",
     "org.apache.pdfbox"            %  "pdfbox"                             % "2.0.34",
     "org.apache.pdfbox"            %  "pdfbox-parent"                      % "2.0.34" pomOnly(),
@@ -117,12 +117,13 @@ val buildSettings = Seq(
   dependencyOverrides ++= Seq(
     "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0",
     "xerces" % "xercesImpl" % "2.12.2",
-    "org.apache.commons" % "commons-compress" % "1.26.2",
+    "org.apache.commons" % "commons-compress" % "1.28.0",
     "io.netty" % "netty-handler" % "4.1.123.Final",
     "org.apache.jena" % "jena-core" % "5.5.0",
     "com.google.protobuf" % "protobuf-java" % "4.31.1",
-    "com.google.guava" % "guava" % "33.4.8-jre"
-  )
+    "com.google.guava" % "guava" % "33.4.8-jre",
+    "commons-beanutils" % "commons-beanutils" %  "1.11.0"
+)
 )
 
 lazy val scalaxbSettings = Seq(

src/main/scala/ch/openolitor/core/BaseRouteService.scala

@@ -47,6 +47,7 @@ import ch.openolitor.stammdaten.models.ProjektVorlageId
 import ch.openolitor.util.ZipBuilderWithFile
 import com.tegonal.CFEnvConfigLoader.ConfigLoader
 import com.typesafe.scalalogging.LazyLogging
+import org.apache.pdfbox.Loader
 import org.apache.pdfbox.multipdf.PDFMergerUtility
 import org.apache.pdfbox.pdmodel.PDDocument
 import org.odftoolkit.simple.SpreadsheetDocument
@@ -320,7 +321,8 @@ trait BaseRouteService extends ExecutionContextAware with SprayJsonSupport with
         case Right(file) =>
           val name = if (file.metaData.name.isEmpty) ref.id.id else file.metaData.name
           logger.debug(s"merge pdf file:${ref.id.id} => $name")
-          PDFmerged.appendDocument(mergedFile, PDDocument.load(file.file))
+          val loadedFile = Loader.loadPDF(file.file.readAllBytes());
+          PDFmerged.appendDocument(mergedFile, loadedFile)
       }
     })) {
       case Success(result) =>

src/main/scala/ch/openolitor/core/reporting/PDFReportResultCollector.scala

@@ -28,6 +28,7 @@ import ch.openolitor.buchhaltung.models.RechnungId
 import ch.openolitor.core.DateFormats
 import ch.openolitor.core.jobs.JobQueueService.FileResultPayload
 import ch.openolitor.core.reporting.ReportSystem._
+import org.apache.pdfbox.Loader
 import org.apache.pdfbox.multipdf.PDFMergerUtility
 import org.apache.pdfbox.pdmodel.PDDocument
 
@@ -63,7 +64,8 @@ class PDFReportResultCollector(reportSystem: ActorRef, override val jobQueueServ
       notifyProgress(stats)
     case SingleReportResult(id: RechnungId, stats, Right(result: ReportResultWithDocument)) =>
       log.debug(s"Add Pdf Entry:${result.name}")
-      pdfFiles = pdfFiles :+ (id, PDDocument.load(result.document))
+      val loadedFile = Loader.loadPDF(result.document);
+      pdfFiles = pdfFiles :+ (id, loadedFile)
       notifyProgress(stats)
     case result: GenerateReportsStats if result.numberOfReportsInProgress == 0 =>
       pdfFiles.sortBy(_._1) foreach { file =>