Skip to content

chore: Upgrade to Java 21 #871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jorgeazevedo wants to merge 4 commits into
base: main
Choose a base branch
from
+8 −9
Draft

chore: Upgrade to Java 21 #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1290225
chore: Upgrade to Java 21
jorgeazevedo Feb 13, 2026
5001606
chore: Use major Java version only in .tool-versions
jorgeazevedo Feb 13, 2026
f147aa1
chore: Update JVM flags for Java 21 compatibility
jorgeazevedo Feb 13, 2026
3818cac
chore: Replace deprecated JavaConverters with CollectionConverters
jorgeazevedo Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java corretto-11.0.25.9.1
java corretto-21
2 changes: 1 addition & 1 deletion app/metrics/CloudWatch.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import play.api.mvc.Handler.Stage
import services.OldInstanceAccountHistory
import utils.Aws

import scala.collection.JavaConverters.*
import scala.jdk.CollectionConverters.*
import scala.concurrent.{ExecutionContext, Future}
import scala.jdk.FutureConverters.*

Expand Down
9 changes: 4 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ ThisBuild / scalaVersion := "3.3.7"
Universal / javaOptions ++= Seq(
"-Dpidfile.path=/dev/null",
s"-Dconfig.file=/etc/${name.value}.conf",
"-J-XX:MaxRAMFraction=2",
"-J-XX:InitialRAMFraction=2",
"-J-XX:MaxRAMPercentage=50.0",
"-J-XX:InitialRAMPercentage=50.0",
"-J-XX:MaxMetaspaceSize=300m",
"-J-Xlog:gc*",
s"-J-Xloggc:/var/log/${packageName.value}/gc.log"
s"-J-Xlog:gc*:file=/var/log/${packageName.value}/gc.log:time,level,tags"
)

Test / javaOptions += "-Dconfig.file=conf/application.test.conf"
Expand Down Expand Up @@ -83,4 +82,4 @@ Universal / packageName := name.value
maintainer := "Guardian Developers <dig.dev.software@theguardian.com>"
packageSummary := "AMIable"
packageDescription := "Web app for monitoring the use of AMIs"
debianPackageDependencies := Seq("java-11-amazon-corretto-jdk:arm64")
debianPackageDependencies := Seq("java-21-amazon-corretto-jdk:arm64")
2 changes: 1 addition & 1 deletion cdk/lib/amiable/amiable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export class Amiable extends GuStack {
},
applicationLogging: { enabled: true },
scaling: { minimumInstances: 1 },
imageRecipe: "arm64-focal-java11-deploy-infrastructure",
imageRecipe: "arm64-noble-java21-deploy-infrastructure",
instanceMetricGranularity: "5Minute"
});

Expand Down
2 changes: 1 addition & 1 deletion test/metrics/CloudWatchTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.scalatest.freespec.AnyFreeSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.OptionValues

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._

class CloudWatchTest extends AnyFreeSpec with Matchers with OptionValues {
val cloudwatch = new CloudWatch()
Expand Down