From 6609289780999670a9f57dda94cc60abad819999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Jourdan-Weil?= <gjourdanweil@gmail.com>
Date: Fri, 15 May 2026 14:34:07 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20chore:=20baseline=20Java=2017?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-test.yml | 12 ++++++------
 .github/workflows/publish.yml    |  2 +-
 build.sbt                        | 12 ++----------
 project/Common.scala             |  4 ++--
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 96cb9f2f..bd19ce62 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -23,23 +23,23 @@ jobs:
     name: Binary Compatibility
     uses: playframework/.github/.github/workflows/binary-check.yml@v4
 
-  check-docs-11:
+  check-docs:
     name: Docs
     uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
-      java: 11
+      java: 17
       scala: 2.13.x, 3.x
       cmd: sbt ++$MATRIX_SCALA docs/test
 
-  tests-11:
+  tests:
     name: Tests
     needs:
       - "check-code-style"
       - "check-binary-compatibility"
-      - "check-docs-11"
+      - "check-docs"
     uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
-      java: 11
+      java: 17
       scala: 2.13.x, 3.x
       cmd: sbt ++$MATRIX_SCALA publishLocal test
 
@@ -47,5 +47,5 @@ jobs:
     name: Finish
     if: github.event_name == 'pull_request'
     needs: # Should be last
-      - "tests-11"
+      - "tests"
     uses: playframework/.github/.github/workflows/rtm.yml@v4
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index aaea5fc7..2b76f885 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -12,4 +12,4 @@ jobs:
     uses: playframework/.github/.github/workflows/publish.yml@v4
     secrets: inherit
     with:
-      java: 8
+      java: 17
diff --git a/build.sbt b/build.sbt
index 3377cda8..c5dfcdea 100644
--- a/build.sbt
+++ b/build.sbt
@@ -204,20 +204,12 @@ lazy val `anorm-core` = project
         ProblemFilters.exclude[IncompatibleResultTypeProblem]("anorm.ColumnNotFound.copy$default$2")
       ),
       libraryDependencies ++= {
-        val h2Ver = sys.props.get("java.version") match {
-          case Some(v) if v.startsWith("1.8") =>
-            "2.2.224"
-
-          case _ =>
-            "2.3.230"
-        }
-
         Seq(
           "joda-time"               % "joda-time"                % "2.14.2",
           "org.joda"                % "joda-convert"             % "3.0.1",
           "org.scala-lang.modules" %% "scala-parser-combinators" % parserCombinatorsVer.value,
-          "org.scala-lang.modules" %% "scala-xml"                % xmlVer % Test,
-          "com.h2database"          % "h2"                       % h2Ver  % Test,
+          "org.scala-lang.modules" %% "scala-xml"                % xmlVer    % Test,
+          "com.h2database"          % "h2"                       % "2.3.230" % Test,
           acolyte
         ) ++ specs2Test
       },
diff --git a/project/Common.scala b/project/Common.scala
index 41f47ca2..9caf177a 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -24,9 +24,9 @@ object Common extends AutoPlugin {
       val v = scalaBinaryVersion.value
 
       if (v == "2.13") {
-        Seq("-release", "8") :+ "-Xlint"
+        Seq("-release", "17") :+ "-Xlint"
       } else {
-        Seq("-release", "8")
+        Seq("-release", "17")
       }
     },
     scalacOptions ++= {