DEOPSOSWMG-139: Fixed warnings, updated CHANGELOG.md

tmtsoftware · Jan 14, 2025 · edb42ef · edb42ef
1 parent e57b40b
commit edb42ef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
 - Upgraded to Scala-3, JDK-21
 - Replaced use of akka libraries with org.apache.pekko
 - Added some supporting methods for Java for JSON serialization of the coordinate classes in csw.params.core.formats.JsonSupport
+- Replaced embedded-redis lib with a different version that supports recent MacOS versions (for testing)
 
 ## [CSW v5.0.1] - 2023-04-12
 This is the final release version v5.0.1 of the TMT Common Software for project stakeholders.

diff --git a/integration/src/multi-jvm/scala/csw/framework/command/CommandServiceTest.scala b/integration/src/multi-jvm/scala/csw/framework/command/CommandServiceTest.scala
@@ -356,7 +356,7 @@ class CommandServiceTest(ignore: Int)
       val commandResponse = Await.result(matchResponseF, timeout.duration)
       commandResponse shouldBe a[Completed]
 
-      val onewayMatchF: Future[SubmitResponse with MatchingResponse] = async {
+      val onewayMatchF: Future[SubmitResponse & MatchingResponse] = async {
         await(assemblyCmdService.onewayAndMatch(setupWithMatcher, demandMatcher)) match {
           case i: Invalid =>
             // Command was not accepted

diff --git a/integration/src/multi-jvm/scala/csw/location/server/http/MultiNodeHTTPLocationService.scala b/integration/src/multi-jvm/scala/csw/location/server/http/MultiNodeHTTPLocationService.scala
@@ -17,7 +17,7 @@ import org.scalatest.BeforeAndAfterAll
 import scala.util.Try
 
 trait MultiNodeHTTPLocationService {
-  self: LSNodeSpec[_] with BeforeAndAfterAll =>
+  self: LSNodeSpec[?] & BeforeAndAfterAll =>
   private val maybeBinding: Option[Http.ServerBinding] = Try {
     val clusterSettings = ClusterSettings.make(self.typedSystem)
     val binding         = ServerWiring.make(clusterSettings, enableAuth = false).locationHttpService.start()