diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt
index 4c21da0c..b41755bb 100644
--- a/docs/project/plugins.sbt
+++ b/docs/project/plugins.sbt
@@ -8,7 +8,7 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true)
 
 addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.8"))
 
-addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
+addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0")
 
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5")
 
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 bf8d10ad..7a4b572a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -8,4 +8,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1")
 
-addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
+addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0")