Revert spotless to working version (#4884)

* Revert "Fix Intellij import (#4877)"

This reverts commit 63aec1a401.

* Revert "Update spotless (#4863)"

This reverts commit a4f70cbd86.

conventions/build.gradle.kts

@@ -1,8 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  // TEMPORARY NOTE: Intellij (re-)import is currently failing with 6.0.3 and 6.0.4
-  id("com.diffplug.spotless") version "6.0.2"
+  id("com.diffplug.spotless") version "5.16.0"
 }
 
 spotless {
@@ -36,7 +35,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.0.2")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
   implementation("com.google.guava:guava:31.0.1-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0")

instrumentation/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestAsyncWebServer.scala

@@ -31,7 +31,7 @@ object AkkaHttpTestAsyncWebServer {
             def doCall(): HttpResponse = {
               val resp = HttpResponse(status =
                 endpoint.getStatus
-              ) // .withHeaders(headers.Type)resp.contentType = "text/plain"
+              ) //.withHeaders(headers.Type)resp.contentType = "text/plain"
               endpoint match {
                 case SUCCESS => resp.withEntity(endpoint.getBody)
                 case INDEXED_CHILD =>

instrumentation/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestWebServer.scala

@@ -27,7 +27,7 @@ object AkkaHttpTestWebServer {
     )
   }
 
-  val route = { // handleExceptions(exceptionHandler) {
+  val route = { //handleExceptions(exceptionHandler) {
     path(SUCCESS.rawPath) {
       complete(
         HttpResponse(status = SUCCESS.getStatus).withEntity(SUCCESS.getBody)