Remove APOR S3Mock dependant test and revert java 17 and cassandra 5 …

…changes

build.sbt

@@ -3,7 +3,7 @@ import BuildSettings._
 import sbtassembly.AssemblyPlugin.autoImport.assemblyMergeStrategy
 import com.typesafe.sbt.packager.docker._
 
-lazy val commonDeps = Seq(logback, scalaTest, scalaCheck, akkaHttpSprayJson, testContainers, apacheCommonsIO, s3Mock,log4jToSlf4j, slf4j, kubernetesApi)
+lazy val commonDeps = Seq(logback, scalaTest, scalaCheck, akkaHttpSprayJson, testContainers, apacheCommonsIO, s3Mock, log4jToSlf4j, kubernetesApi)
 
 lazy val sparkDeps =
   Seq(
@@ -50,7 +50,7 @@ lazy val akkaPersistenceDeps =
   )
 
 lazy val akkaHttpDeps =
-  Seq(akkaHttp, akkaHttp2, akkaHttpTestkit, akkaStreamsTestKit, akkaHttpCirce, akkaHttpXml)
+  Seq(akkaHttp, akkaHttp2, akkaHttpXml, akkaHttpTestkit, akkaStreamsTestKit, akkaHttpCirce)
 lazy val circeDeps      = Seq(circe, circeGeneric, circeParser)
 lazy val enumeratumDeps = Seq(enumeratum, enumeratumCirce)
 

docker-compose.yml

@@ -34,7 +34,7 @@ services:
 
   # ------------- Cassandra -------------
   cassandra:
-    image: "cassandra:5.0"
+    image: "cassandra:3.11.4"
     ports:
       - "9042:9042"
     logging:

project/BuildSettings.scala

@@ -20,7 +20,6 @@ object BuildSettings {
       version := buildVersion,
       scalaVersion := buildScalaVersion,
       scalacOptions ++= Seq("-Xlint", "-deprecation", "-unchecked", "-feature", "-Ymacro-annotations"),
-      envVars ++= Map("JDK_JAVA_OPTIONS" -> "--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"),
       assembly / aggregate := false,
       Test / parallelExecution:= false,
       Test / fork := true,

project/Dependencies.scala

@@ -1,4 +1,4 @@
-import sbt._
+import sbt.*
 
 object Dependencies {
 
@@ -26,11 +26,11 @@ object Dependencies {
   lazy val akkaStreamTyped          = "com.typesafe.akka"   %% "akka-stream-typed"           % Version.akka
   lazy val akkaStreamsTestKit       = "com.typesafe.akka"   %% "akka-stream-testkit"         % Version.akka % Test
   lazy val akkaHttp                 = "com.typesafe.akka"   %% "akka-http"                   % Version.akkaHttp
-  lazy val akkaHttp2                = "com.typesafe.akka"   %% "akka-http2-support"          % Version.akkaHttp
+  lazy val akkaHttp2                = "com.typesafe.akka"   %% "akka-http2-support"          % Version.akkaHttp2Support
+  lazy val akkaHttpXml              = "com.typesafe.akka"   %% "akka-http-xml"               % Version.akkaHttp
   lazy val akkaHttpTestkit          = "com.typesafe.akka"   %% "akka-http-testkit"           % Version.akkaHttp % Test
   lazy val akkaHttpSprayJson        = "com.typesafe.akka"   %% "akka-http-spray-json"        % Version.akkaHttp
   lazy val slickPostgres            = "com.github.tminglei" %% "slick-pg"                    % Version.slickPostgres
-  lazy val akkaHttpXml              = "com.typesafe.akka"   %% "akka-http-xml"               % Version.akkaHttp
   lazy val akkaHttpCirce            = "de.heikoseeberger"   %% "akka-http-circe"             % Version.akkaHttpJson
   lazy val akkaManagementClusterBootstrap =
     "com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" % Version.akkaClusterManagement exclude ("com.typesafe.akka", "akka-http") exclude ("com.typesafe.akka", "akka-http-xml")
@@ -88,7 +88,4 @@ object Dependencies {
   // overriding the log4j-slf4j bridge used by spring, transitively brought in by s3mock
   // this is needed because of CVE-2021-44228 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44228
   lazy val log4jToSlf4j          = "org.apache.logging.log4j"   % "log4j-to-slf4j"              % Version.log4j % Test
-
-  // Override slf4j to fix logging because older versions under 1.7.x are not compatible
-  lazy val slf4j                 = "org.slf4j"                  % "slf4j-api"                   % Version.slf4j % Test
 }

project/Version.scala

@@ -4,7 +4,8 @@ object Version {
   val scalaTest              = "3.0.8"
   val scalaCheck             = "1.17.0"
   val akka                   = "2.9.4"
-  val akkaHttp               = "10.5.2"
+  val akkaHttp               = "10.6.3"
+  val akkaHttp2Support       = "10.5.3"
   val akkaHttpJson           = "1.39.2"
   val akkaClusterManagement  = "1.5.2"
   val akkaCors               = "1.2.0"
@@ -16,7 +17,7 @@ object Version {
   val slickPostgres          = "0.21.1"
   val postgres               = "42.6.0"
   val h2                     = "2.1.214"
-  val s3mock                 = "3.9.1"
+  val s3mock                 = "2.17.0"//"2.1.19" //"3.9.1"
   val apacheCommons          = "2.6"
   val keycloak               = "22.0.1"
   val resteasy               = "6.2.4.Final"
@@ -40,7 +41,6 @@ object Version {
   val scalacheckShapeless    = "1.2.5"
   val diffx                  = "0.4.0"
   val log4j                  = "2.15.0"
-  val slf4j                  = "2.0.13"
   val kubernetesApi          = "21.0.0-legacy"
   val testContainers         = "1.19.8"
 }