Merge branch 'master' into update/scala-xml-2.4.0

Author: micossow

.gitignore

@@ -12,3 +12,6 @@ project/boot
 .bsp
 .db
 .env
+
+.metals
+.bloop

build.sbt

@@ -9,8 +9,8 @@ import scoverage.ScoverageKeys.*
 import scala.sys.process.Process
 
 val v2_12 = "2.12.20"
-val v2_13 = "2.13.15"
-val v3 = "3.3.4"
+val v2_13 = "2.13.16"
+val v3 = "3.3.6"
 
 lazy val resolvedScalaVersion =
   sys.env.get("SCALA_MAJOR_VERSION") match {
@@ -27,7 +27,7 @@ lazy val yarnTask = inputKey[Unit]("Run yarn with arguments")
 lazy val ensureDockerBuildx = taskKey[Unit]("Ensure that docker buildx configuration exists")
 lazy val dockerBuildWithBuildx = taskKey[Unit]("Build docker images using buildx")
 
-val config = "com.typesafe" % "config" % "1.4.3"
+val config = "com.typesafe" % "config" % "1.4.4"
 val pureConfig = "com.github.pureconfig" %% "pureconfig-core" % "0.17.8"
 val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.4.0"
 
@@ -41,7 +41,7 @@ val awaitility = "org.awaitility" % "awaitility-scala" % "4.3.0"
 val amazonJavaSdkSqs = "com.amazonaws" % "aws-java-sdk-sqs" % "1.12.699" exclude ("commons-logging", "commons-logging")
 val amazonJavaV2SdkSqs = "software.amazon.awssdk" % "sqs" % "2.25.60"
 
-val pekkoVersion = "1.1.3"
+val pekkoVersion = "1.1.5"
 val pekkoHttpVersion = "1.1.0"
 val pekkoActor = "org.apache.pekko" %% "pekko-actor" % pekkoVersion
 val pekkoSlf4j = "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion
@@ -83,7 +83,6 @@ val buildSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
   libraryDependencies += scalaXml,
   dependencyOverrides := pekko100verrides,
   parallelExecution := false,
-  sonatypeProfileName := "org.elasticmq",
   // workaround for: https://github.com/sbt/sbt/issues/692
   Test / fork := true,
   assembly / assemblyMergeStrategy := {

project/build.properties

@@ -1 +1 @@
-sbt.version=1.11.0
+sbt.version=1.11.3

project/plugins.sbt

@@ -1,7 +1,7 @@
 // required for sbt-github-release resolution
 resolvers += "Era7 maven releases" at "https://s3-eu-west-1.amazonaws.com/releases.era7.com"
 
-val sbtSoftwaremillVersion = "2.0.25"
+val sbtSoftwaremillVersion = "2.1.0"
 addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwaremillVersion)
 addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwaremillVersion)
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.1")

rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/AmazonJavaSdkTestSuite.scala

@@ -445,10 +445,10 @@ class AmazonJavaSdkTestSuite extends SqsClientServerCommunication with Matchers
       client.sendMessage(new SendMessageRequest(fifoQueueUrl, "A body"))
     )
 
-    // Regular queues don't allow message groups
-    assertInvalidParameterQueueTypeException("MessageGroupId")(
-      client.sendMessage(new SendMessageRequest(regularQueueUrl, "A body").withMessageGroupId("group-1"))
-    )
+    // Regular queues now allow message groups
+    // Test that sending MessageGroupId to regular queue works
+    val result = client.sendMessage(new SendMessageRequest(regularQueueUrl, "A body").withMessageGroupId("group-1"))
+    result should not be null
   }
 
   test("FIFO queues do not support delaying individual messages") {

rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/SendMessageDirectives.scala

@@ -88,17 +88,14 @@ trait SendMessageDirectives {
       .fold(error => throw SQSException.invalidAttributeValue("MessageBody", Some(error)), identity)
 
     val messageGroupId = parameters.MessageGroupId match {
-      // MessageGroupId is only supported for FIFO queues
-      case Some(v) if !queueData.isFifo => throw SQSException.invalidQueueTypeParameter(MessageGroupIdParameter)
-
       // MessageGroupId is required for FIFO queues
       case None if queueData.isFifo => throw SQSException.missingParameter(MessageGroupIdParameter)
 
-      // Ensure the given value is valid
+      // Ensure the given value is valid (for both FIFO and standard queues)
       case Some(id) if !isValidFifoPropertyValue(id) =>
         throw SQSException.invalidAlphanumericalPunctualParameterValue(MessageGroupIdParameter)
 
-      // This must be a correct value (or this isn't a FIFO queue and no value is required)
+      // This must be a correct value or None
       case m => m
     }