Skip to content

Commit c588c09

Browse files
authored
update JDK version to 21 or 17 in Scala frameworks to get the performance improvements from recent JDK versions: (#9837)
- akka-http - blaze - cask - finagle - finatra - finch - http4s - otavia - pekko-http - scalene - vertx-web-scala - youi
1 parent c69d468 commit c588c09

File tree

73 files changed

+146
-1382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+146
-1382
lines changed

frameworks/Scala/akka-http/akka-http-slick-postgres.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM hseeberger/scala-sbt:8u265_1.3.13_2.13.3
1+
FROM sbtscala/scala-sbt:eclipse-temurin-21.0.6_7_1.10.11_2.13.16
22

33
WORKDIR /akka-http-slick-postgres
44

frameworks/Scala/akka-http/akka-http-slick-postgres/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ lazy val commonSettings =
6262
Seq(
6363
organization := "net.benchmark.akka.http",
6464
organizationName := "Akka",
65-
scalaVersion := "2.13.3",
65+
scalaVersion := "2.13.16",
6666
scalacOptions ++= Seq(
6767
"-deprecation",
6868
"-encoding",
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.3.13
1+
sbt.version=1.10.11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
22
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.16")
33
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15")
4-
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.10")
4+
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.3.2")
55
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.3")
66

77
libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.25" // Needed by sbt-git

frameworks/Scala/akka-http/akka-http-slick-postgres/src/main/scala/net/benchmark/akka/http/fortune/FortuneRoute.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ object FortuneRoute {
3535

3636
class FortuneRoute(fr: FortuneRepository, sd: ExecutionContextExecutor)(implicit val system: ActorSystem) {
3737

38-
private implicit val fmar = FortuneRoute.fm
38+
private implicit val fmar: ToEntityMarshaller[Seq[Fortune]] = FortuneRoute.fm
3939

4040
private def source(p: DatabasePublisher[Fortune]): Source[Fortune, NotUsed] = {
4141
Source

frameworks/Scala/akka-http/akka-http.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM hseeberger/scala-sbt:8u265_1.3.13_2.13.3
1+
FROM sbtscala/scala-sbt:eclipse-temurin-21.0.6_7_1.10.11_2.13.16
22

33
WORKDIR /akka-http
44

@@ -23,4 +23,4 @@ RUN sbt clean compile stage
2323

2424
EXPOSE 9000
2525

26-
CMD ["target/universal/stage/bin/akka-http-benchmark", "-Dakka.http.benchmark.mysql.dbhost=tfb-database", "-J-server", "-J-Xms2g", "-J-Xmx2g", "-J-XX:NewSize=1g", "-J-XX:MaxNewSize=1g", "-J-XX:InitialCodeCacheSize=256m", "-J-XX:ReservedCodeCacheSize=256m", "-J-XX:+UseParallelGC", "-J-XX:-UseBiasedLocking", "-J-XX:+AlwaysPreTouch", "-J-XX:+UseNUMA", "-J-XX:+AggressiveOpts"]
26+
CMD ["target/universal/stage/bin/akka-http-benchmark", "-Dakka.http.benchmark.mysql.dbhost=tfb-database", "-J-server", "-J-Xms2g", "-J-Xmx2g", "-J-XX:NewSize=1g", "-J-XX:MaxNewSize=1g", "-J-XX:InitialCodeCacheSize=256m", "-J-XX:ReservedCodeCacheSize=256m", "-J-XX:+UseParallelGC", "-J-XX:+AlwaysPreTouch", "-J-XX:+UseNUMA"]

frameworks/Scala/akka-http/akka-http/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name := "akka-http-benchmark"
66

77
version := "0.1.0-SNAPSHOT"
88

9-
scalaVersion := "2.13.8"
9+
scalaVersion := "2.13.16"
1010

1111
val akkaV = "2.6.19"
1212
val akkaHttpV = "10.2.9"
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.4
1+
sbt.version=1.10.11
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM openjdk:15
1+
FROM sbtscala/scala-sbt:eclipse-temurin-21.0.6_7_1.10.11_2.13.16
2+
23
WORKDIR /blaze
34
COPY project project
45
COPY src src
56
COPY build.sbt build.sbt
6-
COPY sbt sbt
7-
RUN ./sbt assembly -batch && \
7+
RUN sbt assembly -batch && \
88
mv target/blaze-assembly-1.0.jar . && \
99
rm -Rf target && \
1010
rm -Rf project/target && \
@@ -14,4 +14,4 @@ RUN ./sbt assembly -batch && \
1414

1515
EXPOSE 8080
1616

17-
CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:NewSize=1g", "-XX:MaxNewSize=1g", "-XX:InitialCodeCacheSize=256m", "-XX:ReservedCodeCacheSize=256m", "-XX:+UseParallelGC", "-XX:+UseNUMA", "-XX:-UseBiasedLocking", "-XX:+AlwaysPreTouch", "-jar", "blaze-assembly-1.0.jar", "tfb-database"]
17+
CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:NewSize=1g", "-XX:MaxNewSize=1g", "-XX:InitialCodeCacheSize=256m", "-XX:ReservedCodeCacheSize=256m", "-XX:+UseParallelGC", "-XX:+UseNUMA", "-XX:+AlwaysPreTouch", "-jar", "blaze-assembly-1.0.jar", "tfb-database"]

frameworks/Scala/blaze/build.sbt

+12-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,19 @@ name := "blaze"
22

33
version := "1.0"
44

5-
scalaVersion := "2.13.5"
5+
scalaVersion := "2.13.16"
66

77
libraryDependencies ++= Seq(
8-
"org.http4s" %% "blaze-http" % "0.14.16",
9-
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.7.3",
10-
"ch.qos.logback" % "logback-classic" % "1.2.3"
8+
"org.http4s" %% "blaze-http" % "0.14.18",
9+
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.34.0",
10+
"ch.qos.logback" % "logback-classic" % "1.5.18"
1111
)
1212

13-
crossPaths := false
13+
crossPaths := false
14+
15+
assembly / assemblyMergeStrategy := {
16+
case x if x.contains("module-info.class") => MergeStrategy.discard
17+
case x =>
18+
val oldStrategy = (assembly / assemblyMergeStrategy).value
19+
oldStrategy(x)
20+
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.1
1+
sbt.version=1.10.11

0 commit comments

Comments
 (0)