Merge branch 'master' into update/logback-classic-1.3.16

micossow · web-flow · commit f11e8e6fd688 · 2025-11-27T16:35:18.000+01:00
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -24,3 +24,6 @@ a835b7008a8cd6bfe97706dd8823593ae6bc99f7
 
 # Scala Steward: Reformat with scalafmt 3.8.4
 bc673ded2f2fe337f901f43c41e07c29be15676f
+
+# Scala Steward: Reformat with scalafmt 3.9.10
+6e7eaf18653615e19ca7cb83cab17ac6e049c71b
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,4 +1,4 @@
 template: |
-  ## What’s Changed
+  ## What's Changed
 
   $CHANGES
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches: ['**']
     tags: [v*]
+permissions:
+  contents: write        # release-drafter, auto-merge requirement
+  pull-requests: write   # labeler, auto-merge requirement
 jobs:
   ci-2-12:
     # run on 1) push, 2) external PRs, 3) softwaremill-ci PRs
@@ -21,7 +24,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up SBT
-        uses: sbt/setup-sbt@v1
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1, specifically v1.1.14
 
       - name: Set up JDK
         uses: actions/setup-java@v4
@@ -63,7 +66,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up SBT
-        uses: sbt/setup-sbt@v1
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1, specifically v1.1.14
 
       - name: Set up JDK
         uses: actions/setup-java@v4
@@ -105,7 +108,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up SBT
-        uses: sbt/setup-sbt@v1
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1, specifically v1.1.14
 
       - name: Set up JDK
         uses: actions/setup-java@v4
@@ -147,7 +150,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up SBT
-        uses: sbt/setup-sbt@v1
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1, specifically v1.1.14
 
       - name: Set up JDK
         uses: actions/setup-java@v4
@@ -216,7 +219,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up SBT
-        uses: sbt/setup-sbt@v1
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1, specifically v1.1.14
 
       - name: Set up JDK
         uses: actions/setup-java@v4
@@ -256,7 +259,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up SBT
-        uses: sbt/setup-sbt@v1
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1, specifically v1.1.14
 
       - name: Set up JDK
         uses: actions/setup-java@v4
@@ -300,7 +303,7 @@ jobs:
 
       - name: Publish release notes
         id: create_release
-        uses: release-drafter/release-drafter@v5
+        uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6, specifically v6.1.0
         with:
           config-name: release-drafter.yml
           publish: true
@@ -329,7 +332,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up SBT
-        uses: sbt/setup-sbt@v1
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1, specifically v1.1.14
 
       - name: Set up JDK
         uses: actions/setup-java@v4
@@ -351,7 +354,7 @@ jobs:
           key: ${{ runner.os }}-sbt-release-${{ hashFiles('**/build.sbt') }}
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3, specifically v3.6.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -362,40 +365,15 @@ jobs:
       - name: Publish JVM native docker image
         run: sbt "project nativeServer; assembly; Docker / publish"
 
-  # `automerge` label is attached iff there is exactly one file changed by steward and this file belongs to a
-  # whitelist specified by `labeler.yml`
   label:
-    name: Attach automerge label
     # only for PRs by softwaremill-ci
     if: github.event.pull_request.user.login == 'softwaremill-ci'
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-      # count number of files changed
-      - name: Count number of files changed
-        id: count-changed-files
-        run: |
-          N=$(git diff --name-only -r HEAD^1 HEAD | wc -w)
-          echo "changed_files_num=$N" >> $GITHUB_OUTPUT
-      - name: Launch labeler
-        # skip if more than one file changed
-        if: steps.count-changed-files.outputs.changed_files_num == 1
-        uses: srvaroa/labeler@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    uses: softwaremill/github-actions-workflows/.github/workflows/label.yml@main
+    secrets: inherit
 
   auto-merge:
-    name: Auto merge
     # only for PRs by softwaremill-ci
     if: github.event.pull_request.user.login == 'softwaremill-ci'
     needs: [ci-2-12, ci-2-13, ci-3, ci-docker, ci-native-image-agent-config-verification, label]
-    runs-on: ubuntu-24.04
-    steps:
-      - id: automerge
-        name: automerge
-        uses: "pascalgn/automerge-action@v0.15.6"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_METHOD: "squash"
+    uses: softwaremill/github-actions-workflows/.github/workflows/auto-merge.yml@main
+    secrets: inherit          
diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml
@@ -6,23 +6,14 @@ on:
     - cron: '0 0 * * *'
   workflow_dispatch:
 
+permissions:
+  contents: write        # Required to checkout and push changes
+  pull-requests: write   # Required to create PRs for dependency updates
+
 jobs:
   scala-steward:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-          cache: 'sbt'
-      - name: Launch Scala Steward
-        uses: scala-steward-org/scala-steward-action@v2
-        with:
-          author-name: scala-steward
-          author-email: scala-steward
-          github-token: ${{ secrets.REPO_GITHUB_TOKEN }}
-          repo-config: .scala-steward.conf
-          ignore-opts-files: false
+    uses: softwaremill/github-actions-workflows/.github/workflows/scala-steward.yml@main
+    secrets:
+      github-token: ${{ secrets.SOFTWAREMILL_CI_PR_TOKEN }}
+    with:
+      java-version: '21'
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,6 @@ project/boot
 .env
 
 .metals
-.bloop
+.bloop
+.vscode
+.cursor
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,3 +1,3 @@
-version=3.9.4
+version=3.10.2
 maxColumn = 120
 runner.dialect = scala213
diff --git a/README.md b/README.md
@@ -450,7 +450,7 @@ In case of problems with file mounting on Windows place the `application.ini` an
 Another option is to use custom `Dockerfile`:
 
 ```
-FROM openjdk:8-jre-alpine
+FROM eclipse-temurin:11-jdk-noble
 
 ARG ELASTICMQ_VERSION
 ENV ELASTICMQ_VERSION ${ELASTICMQ_VERSION}
@@ -546,7 +546,7 @@ Publishing Docker image for two different platforms: `amd64` and `arm64` is poss
 Docker Buildx is included in Docker Desktop and Docker Linux packages when installed using the DEB or RPM packages. `build.sbt` has following setup:
 
 * `dockerBuildxSettings` creates Docker Buildx instance
-* Docker base image is `openjdk:11-jdk-stretch` which supports multi-arch images
+* Docker base image is `eclipse-temurin:11-jdk-noble` which supports multi-arch images
 * `dockerBuildCommand` is extended with operator `buildx`
 * `dockerBuildOptions` has two additional parameters: `--platform=linux/arm64,linux/amd64` and `--push`
 
diff --git a/build.sbt b/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.16"
-val v3 = "3.3.6"
+val v2_13 = "2.13.18"
+val v3 = "3.3.7"
 
 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.4"
+val config = "com.typesafe" % "config" % "1.4.5"
 val pureConfig = "com.github.pureconfig" %% "pureconfig-core" % "0.17.8"
 val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.4.0"
 
@@ -42,7 +42,7 @@ val amazonJavaSdkSqs = "com.amazonaws" % "aws-java-sdk-sqs" % "1.12.699" exclude
 val amazonJavaV2SdkSqs = "software.amazon.awssdk" % "sqs" % "2.25.60"
 
 val pekkoVersion = "1.2.1"
-val pekkoHttpVersion = "1.2.0"
+val pekkoHttpVersion = "1.3.0"
 val pekkoActor = "org.apache.pekko" %% "pekko-actor" % pekkoVersion
 val pekkoSlf4j = "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion
 val pekkoStreams = "org.apache.pekko" %% "pekko-stream" % pekkoVersion
@@ -254,7 +254,7 @@ lazy val server: Project = (project in file("server"))
       },
       // docker
       dockerExposedPorts := Seq(9324, 9325),
-      dockerBaseImage := "openjdk:11-jdk-stretch",
+      dockerBaseImage := "eclipse-temurin:11-jdk-noble",
       Docker / packageName := "elasticmq",
       dockerUsername := Some("softwaremill"),
       dockerUpdateLatest := {
diff --git a/core/src/main/scala/org/elasticmq/actor/queue/QueueActorMessageOps.scala b/core/src/main/scala/org/elasticmq/actor/queue/QueueActorMessageOps.scala
@@ -33,7 +33,7 @@ trait QueueActorMessageOps
         receiveMessages(visibilityTimeout, count, receiveRequestAttemptId).send()
       case DeleteMessage(deliveryReceipt) =>
         deleteMessage(deliveryReceipt).send()
-      case LookupMessage(messageId) => messageQueue.getById(messageId.id).map(_.toMessageData)
+      case LookupMessage(messageId)                           => messageQueue.getById(messageId.id).map(_.toMessageData)
       case MoveMessage(message, destination, sourceQueueName) =>
         moveMessage(message, destination, sourceQueueName).send()
       case DeduplicationIdsCleanup =>
diff --git a/core/src/main/scala/org/elasticmq/actor/queue/QueueActorQueueOps.scala b/core/src/main/scala/org/elasticmq/actor/queue/QueueActorQueueOps.scala
@@ -10,7 +10,7 @@ trait QueueActorQueueOps extends Logging {
 
   def receiveAndReplyQueueMsg[T](msg: QueueQueueMsg[T]): ReplyAction[T] =
     msg match {
-      case GetQueueData() => queueData
+      case GetQueueData()                                                   => queueData
       case UpdateQueueDefaultVisibilityTimeout(newDefaultVisibilityTimeout) =>
         logger.info(s"${queueData.name}: Updating default visibility timeout to $newDefaultVisibilityTimeout")
         queueData = queueData.copy(defaultVisibilityTimeout = newDefaultVisibilityTimeout)
@@ -40,7 +40,7 @@ trait QueueActorQueueOps extends Logging {
         messageQueue.clear()
         fifoMessagesHistory = FifoDeduplicationIdsHistory.newHistory()
       case GetQueueStatistics(deliveryTime) => getQueueStatistics(deliveryTime)
-      case UpdateQueueTags(newQueueTags) =>
+      case UpdateQueueTags(newQueueTags)    =>
         logger.info(s"${queueData.name} Adding and Updating tags ${newQueueTags}")
         queueData = queueData.copy(tags = queueData.tags ++ newQueueTags)
       case RemoveQueueTags(tagsToRemove) =>
diff --git a/core/src/main/scala/org/elasticmq/actor/queue/operations/MoveMessageOps.scala b/core/src/main/scala/org/elasticmq/actor/queue/operations/MoveMessageOps.scala
@@ -22,7 +22,7 @@ trait MoveMessageOps extends Logging {
         if (queueData.isFifo) {
           CommonOperations.wasRegistered(messageWithSourceQueueName.toNewMessageData, fifoMessagesHistory) match {
             case Some(_) => ResultWithEvents.empty
-            case None =>
+            case None    =>
               logger.debug(s"Moved message (${messageWithSourceQueueName.id}) from FIFO queue to ${queueData.name}")
               moveMessageToQueue(regenerateDeduplicationId(messageWithSourceQueueName))
           }
diff --git a/persistence/persistence-file/src/main/scala/org/elasticmq/persistence/file/QueueConfigUtil.scala b/persistence/persistence-file/src/main/scala/org/elasticmq/persistence/file/QueueConfigUtil.scala
@@ -25,7 +25,7 @@ object QueueConfigUtil extends Logging {
         .toMap
     ) match {
       case Success(value) => getQueuesFromConfig(value)
-      case Failure(ex) => {
+      case Failure(ex)    => {
         logger.error("Failed to extract queue configuration", ex)
         throw new IllegalStateException(ex)
       }
@@ -35,7 +35,7 @@ object QueueConfigUtil extends Logging {
   private def getQueuesFromConfig(queuesConfig: Map[String, ConfigValue]): List[CreateQueueMetadata] = {
     Try(getQueuesFromConfigUnsafe(queuesConfig)) match {
       case Success(value) => value
-      case Failure(ex) => {
+      case Failure(ex)    => {
         logger.error("Failed to create queues from config", ex)
         throw new IllegalStateException(ex)
       }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,13 +1,13 @@
 // required for sbt-github-release resolution
 resolvers += "Era7 maven releases" at "https://s3-eu-west-1.amazonaws.com/releases.era7.com"
 
-val sbtSoftwaremillVersion = "2.1.0"
+val sbtSoftwaremillVersion = "2.1.1"
 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.4")
 addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.2")
 
 libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.11.601"
 
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/AttributesModule.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/AttributesModule.scala
@@ -109,7 +109,7 @@ trait AttributesModule {
     def read(parameters: Map[String, String]): Map[String, String] = {
       def collect(suffix: Int, acc: Map[String, String]): Map[String, String] = {
         parameters.get("Attribute." + suffix + ".Name") match {
-          case None => acc
+          case None     => acc
           case Some(an) =>
             collect(suffix + 1, acc + (an -> parameters("Attribute." + suffix + ".Value")))
         }
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/CancelMessageMoveTaskDirectives.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/CancelMessageMoveTaskDirectives.scala
@@ -23,7 +23,7 @@ trait CancelMessageMoveTaskDirectives { this: ElasticMQDirectives with QueueURLM
         await(
           queueManagerActor ? CancelMessageMoveTask(params.TaskHandle)
         ) match {
-          case Left(e: ElasticMQError) => throw e.toSQSException
+          case Left(e: ElasticMQError)                 => throw e.toSQSException
           case Right(approximateNumberOfMessagesMoved) =>
             complete(CancelMessageMoveTaskResponse(approximateNumberOfMessagesMoved))
         }
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/ChangeMessageVisibilityDirectives.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/ChangeMessageVisibilityDirectives.scala
@@ -23,7 +23,7 @@ trait ChangeMessageVisibilityDirectives { this: ElasticMQDirectives with Respons
         )
         result.map {
           case Left(error) => throw error.toSQSException
-          case Right(_) =>
+          case Right(_)    =>
             emptyResponse("ChangeMessageVisibilityResponse")
         }
       }
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/DeleteMessageBatchDirectives.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/DeleteMessageBatchDirectives.scala
@@ -27,7 +27,7 @@ trait DeleteMessageBatchDirectives {
           val result = queueActor ? DeleteMessage(DeliveryReceipt(receiptHandle))
 
           result.flatMap {
-            case Right(_) => Future.successful(BatchDeleteMessageResponseEntry(id))
+            case Right(_)            => Future.successful(BatchDeleteMessageResponseEntry(id))
             case Left(invalidHandle) =>
               Future.failed(invalidHandle.toSQSException)
           }
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/ResponseMarshaller.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/ResponseMarshaller.scala
@@ -25,7 +25,7 @@ trait ResponseMarshaller { this: RespondDirectives =>
   ): Marshaller[T, RequestEntity] =
     marshallerDependencies.protocol match {
       case AWSProtocol.`AWSJsonProtocol1.0` => sprayJsonMarshaller[T]
-      case _ =>
+      case _                                =>
         namespace { ns =>
           Marshaller.withFixedContentType[T, RequestEntity](`text/xml(UTF-8)`) { t =>
             val xml = xmlSerializer.toXml(t) % ns
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/SendMessageDirectives.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/SendMessageDirectives.scala
@@ -145,7 +145,7 @@ trait SendMessageDirectives {
       .get(AwsTraceHeaderSystemAttribute)
       .map {
         case StringMessageAttribute(value, _) => TracingId(value)
-        case NumberMessageAttribute(_, _) =>
+        case NumberMessageAttribute(_, _)     =>
           throw SQSException.invalidParameter(
             s"$AwsTraceHeaderSystemAttribute should be declared as a String, instead it was recognized as a Number"
           )
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/TagsModule.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/TagsModule.scala
@@ -14,7 +14,7 @@ trait TagsModule {
       }
       def collect(suffix: Int, acc: Map[String, String]): Map[String, String] = {
         parameters.get(tagPrefix + suffix + ".Key") match {
-          case None => acc
+          case None     => acc
           case Some(an) =>
             parameters.get(tagPrefix + suffix + ".Value") match {
               case None           => collect(suffix + 1, acc + (an -> ""))
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/directives/QueueDirectives.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/directives/QueueDirectives.scala
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/stats/StatisticsDirectives.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/stats/StatisticsDirectives.scala

-Original file line number
+Diff line change
 .env
 .metals
 -.bloop
 +.bloop
 +.vscode
 +.cursor