Bump spotless-plugin-gradle from 6.12.0 to 6.12.1 (#7500)

Bumps [spotless-plugin-gradle](https://github.com/diffplug/spotless)
from 6.12.0 to 6.12.1.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/diffplug/spotless/commit/718a504c123de899e75300e7f2f6c55d7a40da42"><code>718a504</code></a>
Published gradle/6.12.1</li>
<li><a
href="https://github.com/diffplug/spotless/commit/c13acee2130be0b730a14fbadade6e7f597001b7"><code>c13acee</code></a>
Published lib/2.31.1</li>
<li><a
href="https://github.com/diffplug/spotless/commit/552aabf876469227d4bdc0be0da65b6d746fbc19"><code>552aabf</code></a>
fix(deps): update dependency com.facebook:ktfmt to v0.42 (<a
href="https://github-redirect.dependabot.com/diffplug/spotless/issues/1421">#1421</a>)</li>
<li><a
href="https://github.com/diffplug/spotless/commit/4063e9f6d134134e5e1fb706e70a7f4cd6e5b403"><code>4063e9f</code></a>
Add support for KtLint 0.48.0 (<a
href="https://github-redirect.dependabot.com/diffplug/spotless/issues/1432">#1432</a>
fixes <a
href="https://github-redirect.dependabot.com/diffplug/spotless/issues/1430">#1430</a>)</li>
<li><a
href="https://github.com/diffplug/spotless/commit/062e83584650be1dd47f5c8485426e8438b05600"><code>062e835</code></a>
Bump changelogs.</li>
<li><a
href="https://github.com/diffplug/spotless/commit/8f7e00594de49856e2c14edf09d89352e0eddd60"><code>8f7e005</code></a>
spotlessApply</li>
<li><a
href="https://github.com/diffplug/spotless/commit/9a8ccae9ec04ff5e6f37da07cc445242ef69c516"><code>9a8ccae</code></a>
Bump default ktfmt 0.41 -&gt; 0.42</li>
<li><a
href="https://github.com/diffplug/spotless/commit/fb4277d2b1ad172ce17fd4bb398756b527379752"><code>fb4277d</code></a>
Merge branch 'main-ktlint-0.48.0' into renovate/ver_ktfmt</li>
<li><a
href="https://github.com/diffplug/spotless/commit/b44d70d00add006427f3cb8ef2387da543addfa3"><code>b44d70d</code></a>
Move changelog entries to the correct release.</li>
<li><a
href="https://github.com/diffplug/spotless/commit/b3d8e89002c21324f03e896c0d786df3be09839d"><code>b3d8e89</code></a>
spotlessApply for 2023</li>
<li>Additional commits viewable in <a
href="https://github.com/diffplug/spotless/compare/gradle/6.12.0...gradle/6.12.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.diffplug.spotless:spotless-plugin-gradle&package-manager=gradle&previous-version=6.12.0&new-version=6.12.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>

benchmark-overhead-jmh/build.gradle.kts

@@ -50,7 +50,7 @@ tasks {
       "-Dotel.metrics.exporter=none",
       // avoid instrumenting HttpURLConnection for now since it is used to make the requests
       // and this benchmark is focused on servlet overhead for now
-      "-Dotel.instrumentation.http-url-connection.enabled=false"
+      "-Dotel.instrumentation.http-url-connection.enabled=false",
     )
     if (jmhStartFlightRecording != null) {
       args.addAll(
@@ -59,8 +59,8 @@ tasks {
           "-XX:StartFlightRecording=$jmhStartFlightRecording",
           // enabling profiling at non-safepoints helps with micro-profiling
           "-XX:+UnlockDiagnosticVMOptions",
-          "-XX:+DebugNonSafepoints"
-        )
+          "-XX:+DebugNonSafepoints",
+        ),
       )
     }
     // see https://github.com/melix/jmh-gradle-plugin/issues/200

conventions/build.gradle.kts

@@ -38,7 +38,7 @@ dependencies {
   implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.12.0")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.12.1")
   implementation("com.google.guava:guava:31.1-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")

custom-checks/build.gradle.kts

@@ -40,8 +40,8 @@ tasks {
           "--add-exports",
           "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
           "--add-exports",
-          "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
-        )
+          "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+        ),
       )
     }
   }

instrumentation/build.gradle.kts

@@ -10,7 +10,7 @@ val instrumentationProjectMuzzle = listOf(
   tasks.create("muzzle1"),
   tasks.create("muzzle2"),
   tasks.create("muzzle3"),
-  tasks.create("muzzle4")
+  tasks.create("muzzle4"),
 )
 
 var counter = 0

instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts

@@ -18,7 +18,7 @@ sourceSets {
     val shadedDep = project(":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded")
     output.dir(
       shadedDep.file("build/extracted/shadow"),
-      "builtBy" to ":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded:extractShadowJar"
+      "builtBy" to ":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded:extractShadowJar",
     )
   }
 }
@@ -27,8 +27,8 @@ dependencies {
   compileOnly(
     project(
       path = ":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded",
-      configuration = "shadow"
-    )
+      configuration = "shadow",
+    ),
   )
 
   library("com.couchbase.client:java-client:3.1.6")

instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts

@@ -18,7 +18,7 @@ sourceSets {
     val shadedDep = project(":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded")
     output.dir(
       shadedDep.file("build/extracted/shadow"),
-      "builtBy" to ":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded:extractShadowJar"
+      "builtBy" to ":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded:extractShadowJar",
     )
   }
 }
@@ -27,8 +27,8 @@ dependencies {
   compileOnly(
     project(
       path = ":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded",
-      configuration = "shadow"
-    )
+      configuration = "shadow",
+    ),
   )
 
   library("com.couchbase.client:java-client:3.1.0")

instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts

@@ -18,7 +18,7 @@ sourceSets {
     val shadedDep = project(":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded")
     output.dir(
       shadedDep.file("build/extracted/shadow"),
-      "builtBy" to ":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded:extractShadowJar"
+      "builtBy" to ":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded:extractShadowJar",
     )
   }
 }
@@ -27,8 +27,8 @@ dependencies {
   compileOnly(
     project(
       path = ":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded",
-      configuration = "shadow"
-    )
+      configuration = "shadow",
+    ),
   )
 
   library("com.couchbase.client:java-client:3.2.0")

instrumentation/gwt-2.0/javaagent/build.gradle.kts

@@ -68,7 +68,7 @@ class CompilerArgumentsProvider : CommandLineArgumentProvider {
     "-localWorkers", "2",
     "-compileReport",
     "-extra", "$buildDir/testapp/extra",
-    "-draftCompile" // makes compile a bit faster
+    "-draftCompile", // makes compile a bit faster
   )
 }
 

instrumentation/jdbc/bootstrap/build.gradle.kts

@@ -15,7 +15,7 @@ sourceSets {
     val shadedDep = project(":instrumentation:jdbc:library")
     output.dir(
       shadedDep.file("build/extracted/shadow-bootstrap"),
-      "builtBy" to ":instrumentation:jdbc:library:extractShadowJarBootstrap"
+      "builtBy" to ":instrumentation:jdbc:library:extractShadowJarBootstrap",
     )
   }
 }

instrumentation/jdbc/javaagent/build.gradle.kts

@@ -14,8 +14,8 @@ dependencies {
   compileOnly(
     project(
       path = ":instrumentation:jdbc:library",
-      configuration = "shadow"
-    )
+      configuration = "shadow",
+    ),
   )
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
@@ -47,7 +47,7 @@ sourceSets {
     val shadedDep = project(":instrumentation:jdbc:library")
     output.dir(
       shadedDep.file("build/extracted/shadow-javaagent"),
-      "builtBy" to ":instrumentation:jdbc:library:extractShadowJarJavaagent"
+      "builtBy" to ":instrumentation:jdbc:library:extractShadowJarJavaagent",
     )
   }
 }

instrumentation/kotlinx-coroutines/javaagent/src/test/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationTest.kt

@@ -122,9 +122,9 @@ class KotlinCoroutinesInstrumentationTest {
           {
             it.hasName("consume_2")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
-      }
+      },
     )
   }
 
@@ -155,9 +155,9 @@ class KotlinCoroutinesInstrumentationTest {
           {
             it.hasName("preLaunch")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
-      }
+      },
     )
   }
 
@@ -183,9 +183,9 @@ class KotlinCoroutinesInstrumentationTest {
           {
             it.hasName("nested")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
-      }
+      },
     )
   }
 
@@ -239,9 +239,9 @@ class KotlinCoroutinesInstrumentationTest {
           {
             it.hasName("brokenPromise")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
-      }
+      },
     )
   }
 
@@ -260,7 +260,7 @@ class KotlinCoroutinesInstrumentationTest {
         async {
           tracedChild("timeout3")
           true
-        }
+        },
       )
 
       withTimeout(TimeUnit.SECONDS.toMillis(30)) {
@@ -294,9 +294,9 @@ class KotlinCoroutinesInstrumentationTest {
             it
               .hasName("timeout3")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
-      }
+      },
     )
   }
 
@@ -330,7 +330,7 @@ class KotlinCoroutinesInstrumentationTest {
           {
             it.hasName("a2")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
       }
     }
@@ -344,14 +344,14 @@ class KotlinCoroutinesInstrumentationTest {
           {
             it.hasName("b2")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
       }
     }
 
     testing.waitAndAssertSortedTraces(
       orderByRootSpanName("a", "b"),
-      *assertions.toTypedArray()
+      *assertions.toTypedArray(),
     )
   }
 
@@ -374,9 +374,9 @@ class KotlinCoroutinesInstrumentationTest {
           {
             it.hasName("child")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
-      }
+      },
     )
   }
 
@@ -409,9 +409,9 @@ class KotlinCoroutinesInstrumentationTest {
           {
             it.hasName("child")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
-      }
+      },
     )
   }
 
@@ -446,9 +446,9 @@ class KotlinCoroutinesInstrumentationTest {
           {
             it.hasName("child_2")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
-      }
+      },
     )
   }
 
@@ -485,9 +485,9 @@ class KotlinCoroutinesInstrumentationTest {
           {
             it.hasName("nested2")
               .hasParent(trace.getSpan(0))
-          }
+          },
         )
-      }
+      },
     )
   }
 
@@ -557,7 +557,7 @@ class KotlinCoroutinesInstrumentationTest {
         arguments(DispatcherWrapper(Dispatchers.IO)),
         arguments(DispatcherWrapper(Dispatchers.Unconfined)),
         arguments(DispatcherWrapper(threadPool.asCoroutineDispatcher())),
-        arguments(DispatcherWrapper(singleThread.asCoroutineDispatcher()))
+        arguments(DispatcherWrapper(singleThread.asCoroutineDispatcher())),
       )
   }
 

instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt

@@ -13,7 +13,7 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 
 internal enum class KtorHttpServerAttributesGetter :
   HttpServerAttributesGetter<ApplicationRequest, ApplicationResponse> {
-  INSTANCE;
+  INSTANCE, ;
 
   override fun method(request: ApplicationRequest): String {
     return request.httpMethod.value

instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorServerTracing.kt

@@ -26,7 +26,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtr
 import kotlinx.coroutines.withContext
 
 class KtorServerTracing private constructor(
-  private val instrumenter: Instrumenter<ApplicationRequest, ApplicationResponse>
+  private val instrumenter: Instrumenter<ApplicationRequest, ApplicationResponse>,
 ) {
 
   class Configuration {
@@ -95,7 +95,7 @@ class KtorServerTracing private constructor(
       val instrumenterBuilder = Instrumenter.builder<ApplicationRequest, ApplicationResponse>(
         configuration.openTelemetry,
         INSTRUMENTATION_NAME,
-        HttpSpanNameExtractor.create(httpAttributesGetter)
+        HttpSpanNameExtractor.create(httpAttributesGetter),
       )
 
       configuration.additionalExtractors.forEach { instrumenterBuilder.addAttributesExtractor(it) }

instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt

@@ -75,7 +75,7 @@ class KtorHttpServerTest : AbstractHttpServerTest<ApplicationEngine>() {
             call.respondText(
               call.parameters["id"]
                 ?: "",
-              status = HttpStatusCode.fromValue(ServerEndpoint.PATH_PARAM.status)
+              status = HttpStatusCode.fromValue(ServerEndpoint.PATH_PARAM.status),
             )
           }
         }

instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpServerAttributesGetter.kt

@@ -13,7 +13,7 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 
 internal enum class KtorHttpServerAttributesGetter :
   HttpServerAttributesGetter<ApplicationRequest, ApplicationResponse> {
-  INSTANCE;
+  INSTANCE, ;
 
   override fun method(request: ApplicationRequest): String {
     return request.httpMethod.value

instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorServerTracing.kt

@@ -26,7 +26,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtr
 import kotlinx.coroutines.withContext
 
 class KtorServerTracing private constructor(
-  private val instrumenter: Instrumenter<ApplicationRequest, ApplicationResponse>
+  private val instrumenter: Instrumenter<ApplicationRequest, ApplicationResponse>,
 ) {
 
   class Configuration {
@@ -95,7 +95,7 @@ class KtorServerTracing private constructor(
       val instrumenterBuilder = Instrumenter.builder<ApplicationRequest, ApplicationResponse>(
         configuration.openTelemetry,
         INSTRUMENTATION_NAME,
-        HttpSpanNameExtractor.create(httpAttributesGetter)
+        HttpSpanNameExtractor.create(httpAttributesGetter),
       )
 
       configuration.additionalExtractors.forEach { instrumenterBuilder.addAttributesExtractor(it) }

instrumentation/ktor/ktor-2.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpServerTest.kt

@@ -75,7 +75,7 @@ class KtorHttpServerTest : AbstractHttpServerTest<ApplicationEngine>() {
             call.respondText(
               call.parameters["id"]
                 ?: "",
-              status = HttpStatusCode.fromValue(ServerEndpoint.PATH_PARAM.status)
+              status = HttpStatusCode.fromValue(ServerEndpoint.PATH_PARAM.status),
             )
           }
         }

instrumentation/ktor/ktor-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/IsIpAddress.kt

@@ -21,14 +21,14 @@ private val ipv6 = Pattern.compile( // Non Compressed
     "|(?=(?:[A-F0-9]{0,4}:){0,7}[A-F0-9]{0,4}(?![:.\\w]))" + // and at most 1 double colon
     "(([0-9A-F]{1,4}:){1,7}|:)((:[0-9A-F]{1,4}){1,7}|:)" + // Compressed with 8 colons
     "|(?:[A-F0-9]{1,4}:){7}:|:(:[A-F0-9]{1,4}){7})(?![:.\\w])\$",
-  Pattern.CASE_INSENSITIVE
+  Pattern.CASE_INSENSITIVE,
 )
 
 // Source: Regular Expressions Cookbook 2nd edition - 8.16.
 // Matching IPv4 Addresses
 private val ipv4 = Pattern.compile(
   "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}" +
-    "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\$"
+    "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\$",
 )
 
 fun isIpAddress(address: String): Boolean {

instrumentation/resources/library/build.gradle.kts

@@ -56,7 +56,7 @@ tasks {
       }
     }
     manifest.attributes(
-      "Multi-Release" to "true"
+      "Multi-Release" to "true",
     )
   }
 }

instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts

@@ -88,7 +88,7 @@ if (!latestDepTest) {
   configurations {
     listOf(
       testRuntimeClasspath,
-      named("testNoReceiveTelemetryRuntimeClasspath")
+      named("testNoReceiveTelemetryRuntimeClasspath"),
     )
       .forEach {
         it.configure {

instrumentation/vaadin-14.2/javaagent/build.gradle.kts

@@ -77,7 +77,7 @@ configurations {
     named("vaadin142TestRuntimeClasspath"),
     named("vaadin14LatestTestRuntimeClasspath"),
     named("vaadin16TestRuntimeClasspath"),
-    named("latestDepTestRuntimeClasspath")
+    named("latestDepTestRuntimeClasspath"),
   )
     .forEach {
       it.configure {

javaagent/build.gradle.kts

@@ -176,7 +176,7 @@ tasks {
         "Agent-Class" to "io.opentelemetry.javaagent.OpenTelemetryAgent",
         "Premain-Class" to "io.opentelemetry.javaagent.OpenTelemetryAgent",
         "Can-Redefine-Classes" to true,
-        "Can-Retransform-Classes" to true
+        "Can-Retransform-Classes" to true,
       )
     }
   }
@@ -269,12 +269,12 @@ licenseReport {
   excludeGroups = arrayOf(
     "io\\.opentelemetry\\.instrumentation",
     "io\\.opentelemetry\\.javaagent",
-    "io\\.opentelemetry\\.dummy\\..*"
+    "io\\.opentelemetry\\.dummy\\..*",
   )
 
   excludes = arrayOf(
     "io.opentelemetry:opentelemetry-bom-alpha",
-    "opentelemetry-java-instrumentation:dependencyManagement"
+    "opentelemetry-java-instrumentation:dependencyManagement",
   )
 
   filters = arrayOf(LicenseBundleNormalizer("$projectDir/license-normalizer-bundle.json", true))
@@ -309,9 +309,9 @@ fun ShadowJar.excludeBootstrapClasses() {
 class JavaagentProvider(
   @InputFile
   @PathSensitive(PathSensitivity.RELATIVE)
-  val agentJar: Provider<RegularFile>
+  val agentJar: Provider<RegularFile>,
 ) : CommandLineArgumentProvider {
   override fun asArguments(): Iterable<String> = listOf(
-    "-javaagent:${file(agentJar).absolutePath}"
+    "-javaagent:${file(agentJar).absolutePath}",
   )
 }

smoke-tests/build.gradle.kts

@@ -60,7 +60,7 @@ tasks {
       "tomcat" to listOf("**/Tomcat*.*"),
       "tomee" to listOf("**/Tomee*.*"),
       "websphere" to listOf("**/Websphere*.*"),
-      "wildfly" to listOf("**/Wildfly*.*")
+      "wildfly" to listOf("**/Wildfly*.*"),
     )
 
     val smokeTestSuite: String? by project

smoke-tests/images/servlet/build.gradle.kts

@@ -22,17 +22,17 @@ val targets = mapOf(
     ImageTarget(listOf("10.0.7"), listOf("hotspot"), listOf("11", "17", "19", "20"), mapOf("sourceVersion" to "10.0.7")),
     ImageTarget(listOf("10.0.7"), listOf("openj9"), listOf("11", "17", "18"), mapOf("sourceVersion" to "10.0.7")),
     ImageTarget(listOf("11.0.7"), listOf("hotspot"), listOf("11", "17", "19", "20"), mapOf("sourceVersion" to "11.0.7"), "servlet-5.0"),
-    ImageTarget(listOf("11.0.7"), listOf("openj9"), listOf("11", "17", "18"), mapOf("sourceVersion" to "11.0.7"), "servlet-5.0")
+    ImageTarget(listOf("11.0.7"), listOf("openj9"), listOf("11", "17", "18"), mapOf("sourceVersion" to "11.0.7"), "servlet-5.0"),
   ),
   "liberty" to listOf(
     ImageTarget(listOf("20.0.0.12"), listOf("hotspot", "openj9"), listOf("8", "11"), mapOf("release" to "2020-11-11_0736")),
     // running configure.sh is failing while building the image with Java 19
     ImageTarget(listOf("21.0.0.10"), listOf("hotspot"), listOf("8", "11", "17"), mapOf("release" to "2021-09-20_1900")),
-    ImageTarget(listOf("21.0.0.10"), listOf("openj9"), listOf("8", "11", "17"), mapOf("release" to "2021-09-20_1900"))
+    ImageTarget(listOf("21.0.0.10"), listOf("openj9"), listOf("8", "11", "17"), mapOf("release" to "2021-09-20_1900")),
   ),
   "payara" to listOf(
     ImageTarget(listOf("5.2020.6"), listOf("hotspot", "openj9"), listOf("8", "11")),
-    ImageTarget(listOf("5.2021.8"), listOf("hotspot", "openj9"), listOf("8", "11"))
+    ImageTarget(listOf("5.2021.8"), listOf("hotspot", "openj9"), listOf("8", "11")),
   ),
   "tomcat" to listOf(
     ImageTarget(listOf("7.0.109"), listOf("hotspot", "openj9"), listOf("8"), mapOf("majorVersion" to "7")),
@@ -41,7 +41,7 @@ val targets = mapOf(
     ImageTarget(listOf("9.0.54"), listOf("hotspot"), listOf("8", "11", "17", "19", "20"), mapOf("majorVersion" to "9")),
     ImageTarget(listOf("9.0.54"), listOf("openj9"), listOf("8", "11", "17", "18"), mapOf("majorVersion" to "9")),
     ImageTarget(listOf("10.0.12"), listOf("hotspot"), listOf("8", "11", "17", "19", "20"), mapOf("majorVersion" to "10"), "servlet-5.0"),
-    ImageTarget(listOf("10.0.12"), listOf("openj9"), listOf("8", "11", "17", "18"), mapOf("majorVersion" to "10"), "servlet-5.0")
+    ImageTarget(listOf("10.0.12"), listOf("openj9"), listOf("8", "11", "17", "18"), mapOf("majorVersion" to "10"), "servlet-5.0"),
   ),
   "tomee" to listOf(
     ImageTarget(listOf("7.0.9"), listOf("hotspot", "openj9"), listOf("8")),
@@ -49,18 +49,18 @@ val targets = mapOf(
     ImageTarget(listOf("8.0.8"), listOf("hotspot"), listOf("8", "11", "17", "19", "20")),
     ImageTarget(listOf("8.0.8"), listOf("openj9"), listOf("8", "11", "17", "18")),
     ImageTarget(listOf("9.0.0-M7"), listOf("hotspot"), listOf("8", "11", "17", "19", "20"), war = "servlet-5.0"),
-    ImageTarget(listOf("9.0.0-M7"), listOf("openj9"), listOf("8", "11", "17", "18"), war = "servlet-5.0")
+    ImageTarget(listOf("9.0.0-M7"), listOf("openj9"), listOf("8", "11", "17", "18"), war = "servlet-5.0"),
   ),
   "websphere" to listOf(
     // TODO (trask) this is a recent change, check back in a while and see if it's been fixed
     // 8.5.5.20 only has linux/ppc64le image
-    ImageTarget(listOf("8.5.5.19", "9.0.5.9"), listOf("openj9"), listOf("8"), windows = false)
+    ImageTarget(listOf("8.5.5.19", "9.0.5.9"), listOf("openj9"), listOf("8"), windows = false),
   ),
   "wildfly" to listOf(
     ImageTarget(listOf("13.0.0.Final"), listOf("hotspot", "openj9"), listOf("8")),
     ImageTarget(listOf("17.0.1.Final", "21.0.0.Final", "25.0.1.Final"), listOf("hotspot"), listOf("8", "11", "17", "19", "20")),
-    ImageTarget(listOf("17.0.1.Final", "21.0.0.Final", "25.0.1.Final"), listOf("openj9"), listOf("8", "11", "17", "18"))
-  )
+    ImageTarget(listOf("17.0.1.Final", "21.0.0.Final", "25.0.1.Final"), listOf("openj9"), listOf("8", "11", "17", "18")),
+  ),
 )
 
 val matrix = mutableListOf<String>()

testing/agent-for-testing/build.gradle.kts

@@ -36,7 +36,7 @@ tasks {
       manifest.from(
         zipTree(agent.singleFile).matching {
           include("META-INF/MANIFEST.MF")
-        }.singleFile
+        }.singleFile,
       )
     }
   }
@@ -54,9 +54,9 @@ tasks {
 class JavaagentProvider(
   @InputFile
   @PathSensitive(PathSensitivity.RELATIVE)
-  val agentJar: Provider<RegularFile>
+  val agentJar: Provider<RegularFile>,
 ) : CommandLineArgumentProvider {
   override fun asArguments(): Iterable<String> = listOf(
-    "-javaagent:${file(agentJar).absolutePath}"
+    "-javaagent:${file(agentJar).absolutePath}",
   )
 }