This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-management.git
The following commit(s) were added to refs/heads/main by this push:
new 1b57a18d Update sbt-java-formatter to 0.12.0 (#768)
1b57a18d is described below
commit 1b57a18d95fc155bc68555c9b32894f2e9c07197
Author: Philippus Baalman <[email protected]>
AuthorDate: Sat May 9 01:39:04 2026 +0200
Update sbt-java-formatter to 0.12.0 (#768)
---
build.sbt | 38 ++++++++++++++++++++------------------
project/Common.scala | 2 ++
project/plugins.sbt | 2 +-
3 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/build.sbt b/build.sbt
index ff1066df..23bbf590 100644
--- a/build.sbt
+++ b/build.sbt
@@ -24,6 +24,8 @@ commands := commands.value.filterNot { command =>
ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo
ThisBuild / reproducibleBuildsCheckResolver := Resolver.ApacheMavenStagingRepo
+ThisBuild / javafmtFormatterCompatibleJavaVersion := 17
+
ThisBuild / javafmt / excludeFilter := (javafmt / excludeFilter).value || new
SimpleFileFilter(
_.getCanonicalPath.contains(s"${java.io.File.separator}jdoc${java.io.File.separator}")
)
@@ -78,7 +80,7 @@ lazy val discoveryKubernetesApi =
pekkoModule("discovery-kubernetes-api")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-discovery-kubernetes-api",
- libraryDependencies := Dependencies.discoveryKubernetesApi,
+ libraryDependencies ++= Dependencies.discoveryKubernetesApi,
mimaPreviousArtifactsSet)
.dependsOn(managementPki)
@@ -86,28 +88,28 @@ lazy val discoveryMarathonApi =
pekkoModule("discovery-marathon-api")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-discovery-marathon-api",
- libraryDependencies := Dependencies.discoveryMarathonApi,
+ libraryDependencies ++= Dependencies.discoveryMarathonApi,
mimaPreviousArtifactsSet)
lazy val discoveryAwsApi = pekkoModule("discovery-aws-api")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-discovery-aws-api",
- libraryDependencies := Dependencies.discoveryAwsApi,
+ libraryDependencies ++= Dependencies.discoveryAwsApi,
mimaPreviousArtifactsSet)
lazy val discoveryAwsApiAsync = pekkoModule("discovery-aws-api-async")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-discovery-aws-api-async",
- libraryDependencies := Dependencies.discoveryAwsApiAsync,
+ libraryDependencies ++= Dependencies.discoveryAwsApiAsync,
mimaPreviousArtifactsSet)
lazy val discoveryConsul = pekkoModule("discovery-consul")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-discovery-consul",
- libraryDependencies := Dependencies.discoveryConsul,
+ libraryDependencies ++= Dependencies.discoveryConsul,
mimaPreviousArtifactsSet)
// gathers all enabled routes and serves them (HTTP or otherwise)
@@ -115,21 +117,21 @@ lazy val management = pekkoModule("management")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-management",
- libraryDependencies := Dependencies.managementHttp ++
junitDependencies.value,
+ libraryDependencies ++= Dependencies.managementHttp ++
junitDependencies.value,
mimaPreviousArtifactsSet)
lazy val managementPki = pekkoModule("management-pki")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-management-pki",
- libraryDependencies := Dependencies.managementPki,
+ libraryDependencies ++= Dependencies.managementPki,
mimaPreviousArtifactsSet)
lazy val managementLoglevelsLogback =
pekkoModule("management-loglevels-logback")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-management-loglevels-logback",
- libraryDependencies := Dependencies.managementLoglevelsLogback,
+ libraryDependencies ++= Dependencies.managementLoglevelsLogback,
mimaPreviousArtifactsSet)
.dependsOn(management)
@@ -137,7 +139,7 @@ lazy val managementLoglevelsLog4j2 =
pekkoModule("management-loglevels-log4j2")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-management-loglevels-log4j2",
- libraryDependencies := Dependencies.managementLoglevelsLog4j2,
+ libraryDependencies ++= Dependencies.managementLoglevelsLog4j2,
mimaPreviousArtifactsSet)
.dependsOn(management)
@@ -145,7 +147,7 @@ lazy val managementClusterHttp =
pekkoModule("management-cluster-http")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-management-cluster-http",
- libraryDependencies := Dependencies.managementClusterHttp ++
junitDependencies.value,
+ libraryDependencies ++= Dependencies.managementClusterHttp ++
junitDependencies.value,
// following is needed by Agrona lib
// https://github.com/aeron-io/agrona/wiki/Change-Log#200-2024-12-17
Test / fork := true,
@@ -157,7 +159,7 @@ lazy val managementClusterBootstrap =
pekkoModule("management-cluster-bootstrap"
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-management-cluster-bootstrap",
- libraryDependencies := Dependencies.managementClusterBootstrap ++
junitDependencies.value,
+ libraryDependencies ++= Dependencies.managementClusterBootstrap ++
junitDependencies.value,
// following is needed by Agrona lib
// https://github.com/aeron-io/agrona/wiki/Change-Log#200-2024-12-17
Test / fork := true,
@@ -170,7 +172,7 @@ lazy val leaseKubernetes = pekkoModule("lease-kubernetes")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-lease-kubernetes",
- libraryDependencies := Dependencies.leaseKubernetes,
+ libraryDependencies ++= Dependencies.leaseKubernetes,
mimaPreviousArtifactsSet)
.dependsOn(managementPki)
@@ -178,7 +180,7 @@ lazy val rollingUpdateKubernetes =
pekkoModule("rolling-update-kubernetes")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-rolling-update-kubernetes",
- libraryDependencies := Dependencies.rollingUpdateKubernetes ++
junitDependencies.value,
+ libraryDependencies ++= Dependencies.rollingUpdateKubernetes ++
junitDependencies.value,
// following is needed by Agrona lib
// https://github.com/aeron-io/agrona/wiki/Change-Log#200-2024-12-17
Test / fork := true,
@@ -202,7 +204,7 @@ lazy val leaseKubernetesIntTest =
pekkoModule("lease-kubernetes-int-test")
.disablePlugins(MimaPlugin)
.settings(
name := "pekko-lease-kubernetes-int-test",
- libraryDependencies := Dependencies.leaseKubernetesTest,
+ libraryDependencies ++= Dependencies.leaseKubernetesTest,
version ~= (_.replace('+', '-')),
dockerBaseImage := "eclipse-temurin:17-jre-alpine",
dockerUpdateLatest := true,
@@ -221,7 +223,7 @@ lazy val integrationTestKubernetesApi =
pekkoIntTestModule("kubernetes-api")
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin)
.settings(
- libraryDependencies := Dependencies.bootstrapDemos)
+ libraryDependencies ++= Dependencies.bootstrapDemos)
.dependsOn(management, managementClusterHttp, managementClusterBootstrap,
discoveryKubernetesApi)
.enablePlugins(NoPublish)
@@ -229,7 +231,7 @@ lazy val integrationTestKubernetesApiJava =
pekkoIntTestModule("kubernetes-api-j
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin, NoPublish)
.settings(
- libraryDependencies := Dependencies.bootstrapDemos)
+ libraryDependencies ++= Dependencies.bootstrapDemos)
.dependsOn(
management,
managementClusterHttp,
@@ -240,7 +242,7 @@ lazy val integrationTestKubernetesDns =
pekkoIntTestModule("kubernetes-dns")
.disablePlugins(MimaPlugin)
.enablePlugins(AutomateHeaderPlugin, NoPublish)
.settings(
- libraryDependencies := Dependencies.bootstrapDemos)
+ libraryDependencies ++= Dependencies.bootstrapDemos)
.dependsOn(
management,
managementClusterHttp,
@@ -285,7 +287,7 @@ lazy val integrationTestLocal = pekkoIntTestModule("local")
.enablePlugins(AutomateHeaderPlugin)
.settings(
name := "integration-test-local",
- libraryDependencies := Dependencies.bootstrapDemos)
+ libraryDependencies ++= Dependencies.bootstrapDemos)
.dependsOn(
management,
managementClusterHttp,
diff --git a/project/Common.scala b/project/Common.scala
index 9771ae2d..25f19f55 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -15,6 +15,7 @@ import sbt._
import org.mdedetrich.apache.sonatype.ApacheSonatypePlugin
import sbtdynver.DynVerPlugin
import sbtdynver.DynVerPlugin.autoImport.dynverSonatypeSnapshots
+import com.github.sbt.JavaFormatterPlugin.autoImport.javafmtSortImports
object Common extends AutoPlugin {
@@ -83,6 +84,7 @@ object Common extends AutoPlugin {
"-doc-canonical-base-url",
"https://pekko.apache.org/api/pekko-management/current/";),
autoAPIMappings := true,
+ javafmtSortImports := false,
// show full stack traces and test case durations
Test / testOptions += Tests.Argument("-oDF"),
// -v Log "test run started" / "test started" / "test run finished"
events on log level "info" instead of "debug".
diff --git a/project/plugins.sbt b/project/plugins.sbt
index ca5d2255..7e5af295 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -11,7 +11,7 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" %
"1.11.7")
addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.0")
-addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.11.0")
+addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.12.0")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.6.1")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" %
"3.0.2")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
