From 77088edac26f37ce1be803b10f4e1e044accfbcb Mon Sep 17 00:00:00 2001 From: Andrew Munn Date: Tue, 16 Apr 2024 08:55:50 -0400 Subject: [PATCH 1/4] update spotless to v6.13.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d14ee938b78..83bd4171c37 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } plugins { - id "com.diffplug.spotless" version "6.11.0" + id "com.diffplug.spotless" version "6.13.0" id 'com.github.spotbugs' version '5.0.14' id "de.thetaphi.forbiddenapis" version "3.5.1" From 00bbb2be726581bc2516fdecd3dd5fc7a584c2a1 Mon Sep 17 00:00:00 2001 From: am312 Date: Tue, 16 Apr 2024 09:35:21 -0400 Subject: [PATCH 2/4] update other build.gradle files --- buildSrc/build.gradle.kts | 2 +- dd-smoke-tests/armeria-grpc/application/build.gradle | 2 +- dd-smoke-tests/kafka-3/application/build.gradle | 2 +- dd-smoke-tests/quarkus/application/build.gradle | 2 +- dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle | 2 +- dd-smoke-tests/spring-boot-3.0-native/application/build.gradle | 2 +- dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle | 2 +- dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle | 2 +- dd-smoke-tests/wildfly/spring-ear/build.gradle | 2 +- test-published-dependencies/build.gradle | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 26dcd6380b8..c30ad388761 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ plugins { groovy `java-gradle-plugin` - id("com.diffplug.spotless") version "6.11.0" + id("com.diffplug.spotless") version "6.13.0" } gradlePlugin { diff --git a/dd-smoke-tests/armeria-grpc/application/build.gradle b/dd-smoke-tests/armeria-grpc/application/build.gradle index b517c4a2103..a1fa509667b 100644 --- a/dd-smoke-tests/armeria-grpc/application/build.gradle +++ b/dd-smoke-tests/armeria-grpc/application/build.gradle @@ -7,7 +7,7 @@ buildscript { plugins { id 'application' id 'java' - id "com.diffplug.spotless" version "6.11.0" + id "com.diffplug.spotless" version "6.13.0" id "com.github.johnrengelman.shadow" version "7.1.2" id 'com.google.protobuf' version '0.9.3' } diff --git a/dd-smoke-tests/kafka-3/application/build.gradle b/dd-smoke-tests/kafka-3/application/build.gradle index 25cedb7aca3..32171468d86 100644 --- a/dd-smoke-tests/kafka-3/application/build.gradle +++ b/dd-smoke-tests/kafka-3/application/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.2.2' id 'io.spring.dependency-management' version '1.1.4' - id 'com.diffplug.spotless' version '6.11.0' + id 'com.diffplug.spotless' version '6.13.0' } java { diff --git a/dd-smoke-tests/quarkus/application/build.gradle b/dd-smoke-tests/quarkus/application/build.gradle index 73b41ed48d2..4319e66e02a 100644 --- a/dd-smoke-tests/quarkus/application/build.gradle +++ b/dd-smoke-tests/quarkus/application/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'io.quarkus' - id "com.diffplug.spotless" version "6.11.0" + id "com.diffplug.spotless" version "6.13.0" } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle index bf121bf8f69..c71daf29759 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '2.7.4' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id "com.diffplug.spotless" version "6.11.0" + id "com.diffplug.spotless" version "6.13.0" } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle index d40ca421d80..868dcf3239e 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle @@ -3,7 +3,7 @@ plugins { id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.0.14.RELEASE' id 'org.graalvm.buildtools.native' version '0.9.28' - id 'com.diffplug.spotless' version "6.11.0" + id 'com.diffplug.spotless' version "6.13.0" } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle index 631aeb32d88..ed20308613b 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id "com.diffplug.spotless" version "6.11.0" + id "com.diffplug.spotless" version "6.13.0" } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle index 9dd0e75a7be..7074eb97062 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id "com.diffplug.spotless" version "6.11.0" + id "com.diffplug.spotless" version "6.13.0" } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/wildfly/spring-ear/build.gradle b/dd-smoke-tests/wildfly/spring-ear/build.gradle index 3624d09d64b..5b9f55672a2 100644 --- a/dd-smoke-tests/wildfly/spring-ear/build.gradle +++ b/dd-smoke-tests/wildfly/spring-ear/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'ear' - id "com.diffplug.spotless" version "6.11.0" + id "com.diffplug.spotless" version "6.13.0" } def sharedRootDir = "$rootDir/../../../" diff --git a/test-published-dependencies/build.gradle b/test-published-dependencies/build.gradle index e960a67cede..508531a556e 100644 --- a/test-published-dependencies/build.gradle +++ b/test-published-dependencies/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.diffplug.spotless" version "6.11.0" + id "com.diffplug.spotless" version "6.13.0" } def sharedConfigDirectory = "$rootDir/../gradle" From ab7d6930eff7e1dd1d009981ffbe0413e8a20c8d Mon Sep 17 00:00:00 2001 From: am312 Date: Tue, 16 Apr 2024 09:37:18 -0400 Subject: [PATCH 3/4] one more --- buildSrc/call-site-instrumentation-plugin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts index 90b72f517ad..550e37c2292 100644 --- a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts +++ b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts @@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { java groovy - id("com.diffplug.spotless") version "6.11.0" + id("com.diffplug.spotless") version "6.13.0" id("com.github.johnrengelman.shadow") version "7.1.2" } From 67543ea701214dea208f3f5c7b425c3fe49a4f58 Mon Sep 17 00:00:00 2001 From: am312 Date: Tue, 16 Apr 2024 11:36:21 -0400 Subject: [PATCH 4/4] one more --- .../src/test/groovy/CallSiteInstrumentationPluginTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy b/buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy index f1f8fb4def0..a648341f52c 100644 --- a/buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy +++ b/buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy @@ -10,7 +10,7 @@ class CallSiteInstrumentationPluginTest extends Specification { plugins { id 'java' id 'call-site-instrumentation' - id("com.diffplug.spotless") version "6.11.0" + id("com.diffplug.spotless") version "6.13.0" } sourceCompatibility = JavaVersion.VERSION_1_8