Skip to content

Commit 18c612b

Browse files
authored
Merge branch 'master' into update/pekko-actor-1.3.0
2 parents 4f5ca26 + e88a672 commit 18c612b

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=3.9.10
1+
version=3.10.2
22
maxColumn = 120
33
runner.dialect = scala213

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ In case of problems with file mounting on Windows place the `application.ini` an
450450
Another option is to use custom `Dockerfile`:
451451

452452
```
453-
FROM openjdk:8-jre-alpine
453+
FROM eclipse-temurin:11-jdk-noble
454454
455455
ARG ELASTICMQ_VERSION
456456
ENV ELASTICMQ_VERSION ${ELASTICMQ_VERSION}
@@ -546,7 +546,7 @@ Publishing Docker image for two different platforms: `amd64` and `arm64` is poss
546546
Docker Buildx is included in Docker Desktop and Docker Linux packages when installed using the DEB or RPM packages. `build.sbt` has following setup:
547547

548548
* `dockerBuildxSettings` creates Docker Buildx instance
549-
* Docker base image is `openjdk:11-jdk-stretch` which supports multi-arch images
549+
* Docker base image is `eclipse-temurin:11-jdk-noble` which supports multi-arch images
550550
* `dockerBuildCommand` is extended with operator `buildx`
551551
* `dockerBuildOptions` has two additional parameters: `--platform=linux/arm64,linux/amd64` and `--push`
552552

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import scoverage.ScoverageKeys.*
99
import scala.sys.process.Process
1010

1111
val v2_12 = "2.12.20"
12-
val v2_13 = "2.13.16"
13-
val v3 = "3.3.6"
12+
val v2_13 = "2.13.18"
13+
val v3 = "3.3.7"
1414

1515
lazy val resolvedScalaVersion =
1616
sys.env.get("SCALA_MAJOR_VERSION") match {
@@ -27,7 +27,7 @@ lazy val yarnTask = inputKey[Unit]("Run yarn with arguments")
2727
lazy val ensureDockerBuildx = taskKey[Unit]("Ensure that docker buildx configuration exists")
2828
lazy val dockerBuildWithBuildx = taskKey[Unit]("Build docker images using buildx")
2929

30-
val config = "com.typesafe" % "config" % "1.4.4"
30+
val config = "com.typesafe" % "config" % "1.4.5"
3131
val pureConfig = "com.github.pureconfig" %% "pureconfig-core" % "0.17.8"
3232
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.4.0"
3333

@@ -42,7 +42,7 @@ val amazonJavaSdkSqs = "com.amazonaws" % "aws-java-sdk-sqs" % "1.12.699" exclude
4242
val amazonJavaV2SdkSqs = "software.amazon.awssdk" % "sqs" % "2.25.60"
4343

4444
val pekkoVersion = "1.3.0"
45-
val pekkoHttpVersion = "1.2.0"
45+
val pekkoHttpVersion = "1.3.0"
4646
val pekkoActor = "org.apache.pekko" %% "pekko-actor" % pekkoVersion
4747
val pekkoSlf4j = "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion
4848
val pekkoStreams = "org.apache.pekko" %% "pekko-stream" % pekkoVersion
@@ -254,7 +254,7 @@ lazy val server: Project = (project in file("server"))
254254
},
255255
// docker
256256
dockerExposedPorts := Seq(9324, 9325),
257-
dockerBaseImage := "openjdk:11-jdk-stretch",
257+
dockerBaseImage := "eclipse-temurin:11-jdk-noble",
258258
Docker / packageName := "elasticmq",
259259
dockerUsername := Some("softwaremill"),
260260
dockerUpdateLatest := {

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" %
77
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.4")
88
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
99
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
10-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.0")
10+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.2")
1111

1212
libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.11.601"
1313

0 commit comments

Comments
 (0)