diff --git a/build.sbt b/build.sbt
index 48e10f9e..098c7dc2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -27,6 +27,8 @@ lazy val mimaSettings = Seq(
   )
 )
 
+ThisBuild / javafmtFormatterCompatibleJavaVersion := 11
+
 lazy val root = project
   .in(file("."))
   .aggregate(core, plugin)
diff --git a/docs/build.sbt b/docs/build.sbt
index ddd2e0b4..471bc610 100644
--- a/docs/build.sbt
+++ b/docs/build.sbt
@@ -8,6 +8,8 @@ import sbtheader.LineCommentCreator
 
 SettingKey[Seq[File]]("migrationManualSources") := Nil
 
+ThisBuild / javafmtFormatterCompatibleJavaVersion := 11
+
 lazy val docs = project
   .in(file("."))
   .enablePlugins(PlayDocsPlugin, PlayEbean)
diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt
index f4e1d6ee..e351d19f 100644
--- a/docs/project/plugins.sbt
+++ b/docs/project/plugins.sbt
@@ -8,7 +8,7 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true)
 
 addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.10"))
 
-addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
+addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.12.0")
 
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.0")
 
diff --git a/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java b/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java
index dcb47ccb..6dc66cb1 100644
--- a/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java
+++ b/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java
@@ -125,7 +125,8 @@ private static String generateScript(SpiEbeanServer spiServer) {
     }
 
     return "-- Created by Ebean DDL\r\n"
-        + "-- To stop Ebean DDL generation, remove this comment (both lines) and start using Evolutions\r\n"
+        + "-- To stop Ebean DDL generation, remove this comment (both lines) and start using"
+        + " Evolutions\r\n"
         + "\r\n"
         + "-- !Ups\r\n"
         + "\r\n"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index ff27c5aa..cb226ce0 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -8,4 +8,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.0")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
 
-addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
+addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.12.0")