Merge pull request #675 from OpenOlitor/fix/dep_updates

Updated some deps (sec)
OpenOlitor · Mar 13, 2024 · c80885b · c80885b
2 parents e4b7778 + dd6fd9a
commit c80885b
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 42 deletions.
diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml
@@ -8,5 +8,5 @@ jobs:
     name: Update Dependency Graph
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: scalacenter/sbt-dependency-submission@v2
diff --git a/.github/workflows/sbt-docker-prepublish.yml b/.github/workflows/sbt-docker-prepublish.yml
@@ -10,15 +10,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install locales
       run: sudo apt-get -y install locales
     - name: Fix up git URLs
       run: echo -e '[url "https://github.com/"]\n  insteadOf = "git://github.com/"' >> ~/.gitconfig
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: temurin
     - name: Docker Login
       run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin

diff --git a/.github/workflows/sbt-docker-publish.yml b/.github/workflows/sbt-docker-publish.yml
@@ -10,15 +10,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install locales
       run: sudo apt-get -y install locales
     - name: Fix up git URLs
       run: echo -e '[url "https://github.com/"]\n  insteadOf = "git://github.com/"' >> ~/.gitconfig
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: temurin
     - name: Docker Login
       run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin

diff --git a/.github/workflows/sbt-test.yml b/.github/workflows/sbt-test.yml
@@ -9,15 +9,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install locales
       run: sudo apt-get -y install locales
     - name: Fix up git URLs
       run: echo -e '[url "https://github.com/"]\n  insteadOf = "git://github.com/"' >> ~/.gitconfig
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: temurin
     - name: Run Tests
       run: sbt "coverage; test; coverageReport; coverageAggregate;"

diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.10"
+scalaVersion := "2.13.11"
 
 enablePlugins(JavaServerAppPackaging)
 enablePlugins(DockerPlugin)
@@ -27,24 +27,23 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 
 
-val specs2V = "4.19.0" // based on spray 1.3.x built in support
+val specs2V = "4.20.5" // based on spray 1.3.x built in support
 val akkaV = "2.7.+"
 val sprayV = "1.3.+"
-val scalalikeV = "4.0.0"
-val akkaHttpVersion = "10.2.10"
-val akkaVersion = "2.7.0"
-val testContainersVersion = "1.17.6"
+val scalalikeV = "4.2.1"
+val akkaHttpVersion = "10.5.3"
+val akkaVersion = "2.8.5"
+val testContainersVersion = "1.19.6"
 
 resolvers += Resolver.typesafeRepo("releases")
 
 val buildSettings = Seq(
   scalariformPreferences := scalariformPreferences.value
   .setPreference(DanglingCloseParenthesis, Force)
   .setPreference(AlignSingleLineCaseStatements, true),
-  organization := "ch.openolitor.scalamacros",
-  version := "2.6.28",
-  scalaVersion := "2.13.10",
-  crossScalaVersions := Seq("2.13.8", "2.13.10"),
+  version := "2.6.29",
+  scalaVersion := "2.13.11",
+  crossScalaVersions := Seq("2.13.8", "2.13.10", "2.13.11"),
   resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
   resolvers ++= Resolver.sonatypeOssRepos("releases"),
   resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",
@@ -53,7 +52,7 @@ val buildSettings = Seq(
 
   libraryDependencies ++= {
   Seq(
-    "org.scala-lang.modules"       %% "scala-xml"                          % "2.1.0",
+    "org.scala-lang.modules"       %% "scala-xml"                          % "2.2.0",
     "javax.xml.bind"               %  "jaxb-api"                           % "2.3.1",
     "com.typesafe.akka"            %% "akka-http"                          % akkaHttpVersion,
     "com.typesafe.akka"            %% "akka-http-caching"                  % akkaHttpVersion,
@@ -72,11 +71,11 @@ val buildSettings = Seq(
     "org.specs2"                   %% "specs2-mock"                        % specs2V                                 % "test",
     "org.specs2"                   %% "specs2-junit"                       % specs2V                                 % "test",
     "org.specs2"                   %% "specs2-scalacheck"                  % specs2V                                 % "test",
-    "org.mockito"                  %% "mockito-scala"                      % "1.17.7"                                % "test",
-    "org.scalaz" 		               %% "scalaz-core"						             % "7.3.6", // ### Scala 3
+    "org.mockito"                  %% "mockito-scala"                      % "1.17.30"                                % "test",
+    "org.scalaz" 		               %% "scalaz-core"						             % "7.3.8", // ### Scala 3
     //use scala logging to log outside of the actor system
     "com.typesafe.scala-logging"   %% "scala-logging"				               % "3.9.5", // ### Scala 3
-    "org.scalikejdbc"              %% "scalikejdbc-async"                  % "0.15.0",
+    "org.scalikejdbc"              %% "scalikejdbc-async"                  % "0.19.0",
     "org.scalikejdbc" 	           %% "scalikejdbc-config"				         % scalalikeV, // ### Scala 3
     "org.scalikejdbc"              %% "scalikejdbc-test"                   % scalalikeV                              % "test", // ### Scala 3
     "org.scalikejdbc" 	           %% "scalikejdbc-syntax-support-macro"   % scalalikeV, // ### Scala 3
@@ -85,15 +84,15 @@ val buildSettings = Seq(
     "com.h2database"               %  "h2"                                 % "2.2.224"                               % "test",
     "org.testcontainers"           %  "mariadb"                            % testContainersVersion                   % "test",
     "io.findify"                   %% "s3mock"                             % "0.2.6"                                 % "test",
-    "ch.qos.logback"  	           %  "logback-classic"    		  		       % "1.4.14",
-    "org.mariadb.jdbc"	           %  "mariadb-java-client"                % "3.1.0",
-    "mysql"	                       %  "mysql-connector-java"               % "8.0.31",
+    "ch.qos.logback"  	           %  "logback-classic"    		  		       % "1.5.3",
+    "org.mariadb.jdbc"	           %  "mariadb-java-client"                % "3.1.4",
+    "mysql"	                       %  "mysql-connector-java"               % "8.0.33",
     // Libreoffice document API
     "org.odftoolkit"               %  "simple-odf"					               % "0.9.0" withSources(),
     "com.scalapenos"               %% "stamina-json"                       % "0.1.6", // ### NO Scala 3
     "net.virtual-void"             %% "json-lenses"                        % "0.6.2",
     // s3
-    "com.amazonaws"                %  "aws-java-sdk-s3"                    % "1.12.348",
+    "com.amazonaws"                %  "aws-java-sdk-s3"                    % "1.12.671",
     "de.svenkubiak"                %  "jBCrypt"                            % "0.4.3",
     "com.github.daddykotex"        %% "courier"                            % "3.2.0", // ### Scala 3
     "com.github.nscala-time"       %% "nscala-time"                        % "2.32.0", // ### Scala 3
@@ -102,25 +101,25 @@ 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"                   % "2.4.3",
+    "net.codecrete.qrbill"         %  "qrbill-generator"                   % "3.2.0",
     "io.nayuki"                    %  "qrcodegen"                          % "1.8.0",
-    "org.apache.pdfbox"            %  "pdfbox"                             % "2.0.26",
-    "org.apache.pdfbox"            %  "pdfbox-parent"                      % "2.0.26" pomOnly(),
-    "org.apache.xmlgraphics"       %  "batik-transcoder"                   % "1.16",
-    "org.apache.xmlgraphics"       %  "batik-codec"                        % "1.16",
+    "org.apache.pdfbox"            %  "pdfbox"                             % "2.0.30",
+    "org.apache.pdfbox"            %  "pdfbox-parent"                      % "2.0.30" pomOnly(),
+    "org.apache.xmlgraphics"       %  "batik-transcoder"                   % "1.17",
+    "org.apache.xmlgraphics"       %  "batik-codec"                        % "1.17",
     "com.tegonal"                  %% "cf-env-config-loader"               % "1.1.2", // ### NO Scala 3, NO Scala 2.13
     "com.eatthepath"               %  "java-otp"                           % "0.4.0",
-    "org.apache.pdfbox"            %  "pdfbox-tools"                       % "2.0.27"
+    "org.apache.pdfbox"            %  "pdfbox-tools"                       % "2.0.30"
   )
 },
   dependencyOverrides ++= Seq(
     "org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.1",
     "xerces" % "xercesImpl" % "2.12.2",
-    "org.apache.commons" % "commons-compress" % "1.22",
-    "io.netty" % "netty-handler" % "4.1.85.Final",
+    "org.apache.commons" % "commons-compress" % "1.26.0",
+    "io.netty" % "netty-handler" % "4.1.107.Final",
     "org.apache.jena" % "jena-core" % "4.6.1",
     "com.google.protobuf" % "protobuf-java" % "3.21.10",
-    "com.google.guava" % "guava" % "31.1-jre"
+    "com.google.guava" % "guava" % "33.0.0-jre"
   )
 )
 
@@ -189,7 +188,7 @@ val updateLatest = sys.env.get("DOCKER_UPDATE_LATEST") match {
                       }
 
 dockerUpdateLatest := updateLatest
-dockerBaseImage := "eclipse-temurin:17-alpine"
+dockerBaseImage := "eclipse-temurin:21-alpine"
 dockerExposedPorts ++= Seq(9003)
 
 // the directories created, e.g. /var/log/openolitor-server, are created using user id 1000,

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.0
+sbt.version=1.9.9
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -8,6 +8,6 @@ addSbtPlugin("org.scalaxb" % "sbt-scalaxb" % "1.9.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.0.0")
 //addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.5.10")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
 
-dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
+dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.2.0"
diff --git a/src/main/scala/ch/openolitor/buchhaltung/reporting/RechnungReportData.scala b/src/main/scala/ch/openolitor/buchhaltung/reporting/RechnungReportData.scala
@@ -94,7 +94,7 @@ trait RechnungReportData extends AsyncConnectionPoolContextAware with Buchhaltun
             case _              => Language.DE
           }
           billFormat.setLanguage(language)
-          billFormat.setOutputSize(OutputSize.QR_BILL_WITH_HORIZONTAL_LINE)
+          billFormat.setOutputSize(OutputSize.QR_BILL_EXTRA_SPACE)
           billFormat.setSeparatorType(SeparatorType.DASHED_LINE_WITH_SCISSORS)
           bill.setFormat(billFormat)
           //this value is mandatory for the qrCode. In case of generating qrCode