Merge branch 'master' into update/scala-compiler-2.13.18

# Conflicts:
#	.github/workflows/ci.yml
#	project/Commons.scala

Author: halotukozak

.github/workflows/ci.yml

@@ -16,15 +16,17 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  JAVA_OPTS: '-Dfile.encoding=UTF-8 -Xmx4G'
 
 jobs:
   build:
     name: Build and Test
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.18]
-        java: [temurin@17, temurin@21]
+        java: [temurin@17, temurin@21, temurin@25]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -48,16 +50,22 @@ jobs:
           java-version: 21
           cache: sbt
 
+      - name: Setup Java (temurin@25)
+        if: matrix.java == 'temurin@25'
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 25
+          cache: sbt
+
       - name: Setup sbt
         uses: sbt/setup-sbt@v1
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: 12
+        uses: actions/setup-node@v4
 
       - name: Setup MongoDB
-        uses: supercharge/[email protected].0
+        uses: supercharge/[email protected].1
         with:
           mongodb-version: 8.0
           mongodb-replica-set: test-rs
@@ -75,7 +83,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.17]
+        scala: [2.13.18]
         java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
@@ -100,6 +108,14 @@ jobs:
           java-version: 21
           cache: sbt
 
+      - name: Setup Java (temurin@25)
+        if: matrix.java == 'temurin@25'
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 25
+          cache: sbt
+
       - name: Setup sbt
         uses: sbt/setup-sbt@v1
 

project/Commons.scala

@@ -28,9 +28,9 @@ object Commons extends ProjectGroup("commons") {
   val scalatestVersion = "3.2.19"
   val scalatestplusScalacheckVersion = "3.2.14.0"
   val scalacheckVersion = "1.19.0"
-  val jettyVersion = "12.1.1"
+  val jettyVersion = "12.1.4"
   val mongoVersion = "5.6.1"
-  val springVersion = "6.2.11"
+  val springVersion = "6.2.13"
   val typesafeConfigVersion = "1.4.5"
   val commonsIoVersion = "1.3.2" // test only
   val scalaLoggingVersion = "3.9.6"
@@ -66,30 +66,27 @@ object Commons extends ProjectGroup("commons") {
     ),
 
     scalaVersion := "2.13.18",
-    compileOrder := CompileOrder.Mixed,
 
     githubWorkflowTargetTags ++= Seq("v*"),
-
     githubWorkflowArtifactUpload := false,
-    githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21")),
+    githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21"), JavaSpec.temurin("25")),
+    githubWorkflowEnv += "JAVA_OPTS" -> "-Dfile.encoding=UTF-8 -Xmx4G",
+    githubWorkflowBuildMatrixFailFast := Some(false),
     githubWorkflowBuildPreamble ++= Seq(
       WorkflowStep.Use(
-        UseRef.Public("actions", "setup-node", "v2"),
+        UseRef.Public("actions", "setup-node", "v4"),
         name = Some("Setup Node.js"),
-        params = Map("node-version" -> "12")
       ),
       WorkflowStep.Use(
-        UseRef.Public("supercharge", "mongodb-github-action", "1.12.0"),
+        UseRef.Public("supercharge", "mongodb-github-action", "1.12.1"),
         name = Some("Setup MongoDB"),
         params = Map(
           "mongodb-version" -> "8.0",
           "mongodb-replica-set" -> "test-rs",
         )
       ),
     ),
-
     githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))),
-
     githubWorkflowPublish := Seq(WorkflowStep.Sbt(
       List("ci-release"),
       env = Map(