diff --git a/build-tools-internal/build.gradle b/build-tools-internal/build.gradle index f2a02645f8c09..79b53e15ff33c 100644 --- a/build-tools-internal/build.gradle +++ b/build-tools-internal/build.gradle @@ -383,7 +383,6 @@ tasks.named("jar") { spotless { java { - // workaround for https://github.com/diffplug/spotless/issues/2317 //toggleOffOn() target project.fileTree("src/main/java") { diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 1aed327c45796..125d7cf124df0 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -44,6 +44,6 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2. spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" } spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" } spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" } -spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0" +spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.0.2" wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2" xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 3e8810cb5ef09..9ecf81f046263 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -229,6 +229,11 @@ + + + + + @@ -239,34 +244,19 @@ - - - - - - - - - - - - - + + + - - - + + + - - - - - - - - + + + @@ -1349,6 +1339,11 @@ + + + + + @@ -1737,6 +1732,11 @@ + + + + + @@ -2325,6 +2325,11 @@ + + + + + @@ -3586,6 +3591,11 @@ + + + + + @@ -3596,6 +3606,11 @@ + + + + + @@ -3726,6 +3741,11 @@ + + + + + @@ -3736,6 +3756,11 @@ + + + + + @@ -3756,6 +3781,11 @@ + + + + + @@ -3766,6 +3796,11 @@ + + + + + @@ -3776,6 +3811,11 @@ + + + + + @@ -3786,6 +3826,11 @@ + + + + + @@ -3796,6 +3841,11 @@ + + + + + @@ -3806,6 +3856,11 @@ + + + + + @@ -3826,6 +3881,11 @@ + + + + + @@ -3836,6 +3896,11 @@ + + + + + @@ -3846,6 +3911,11 @@ + + + + + @@ -3861,6 +3931,11 @@ + + + + + @@ -3871,6 +3946,11 @@ + + + + + diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/BaseTransportInferenceActionTestCase.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/BaseTransportInferenceActionTestCase.java index 13e1631abe094..04e27777499b8 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/BaseTransportInferenceActionTestCase.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/BaseTransportInferenceActionTestCase.java @@ -425,7 +425,7 @@ protected void mockValidLicenseState() { when(licenseState.isAllowed(InferencePlugin.INFERENCE_API_FEATURE)).thenReturn(true); } - private void mockNodeClient(){ + private void mockNodeClient() { when(nodeClient.getLocalNodeId()).thenReturn(localNodeId); } } diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/support/SecurityMigrationExecutorTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/support/SecurityMigrationExecutorTests.java index 35fb7726ec813..2c255a255f117 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/support/SecurityMigrationExecutorTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/support/SecurityMigrationExecutorTests.java @@ -213,11 +213,7 @@ public int minMappingVersion() { })) ); - securityMigrationExecutor.nodeOperation( - mockTask, - new SecurityMigrationTaskParams(0, true), - mock(PersistentTaskState.class) - ); + securityMigrationExecutor.nodeOperation(mockTask, new SecurityMigrationTaskParams(0, true), mock(PersistentTaskState.class)); verify(mockTask, times(1)).markAsFailed(any()); verify(mockTask, times(0)).markAsCompleted(); }