diff --git a/build-conventions/build.gradle b/build-conventions/build.gradle index b0eda5a34065a..520cb1e5d9b5f 100644 --- a/build-conventions/build.gradle +++ b/build-conventions/build.gradle @@ -77,7 +77,7 @@ dependencies { api buildLibs.apache.rat compileOnly buildLibs.checkstyle constraints { - api("org.eclipse.platform:org.eclipse.osgi:3.18.300") { + api("org.eclipse.platform:org.eclipse.osgi:3.18.500") { because("Use the same version as we do in spotless gradle plugin at runtime") } } diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 9e470e210fe2b..ef3ffb2caa2db 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -43,7 +43,7 @@ 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 9c39b0ec396f9..1cf29874e4598 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -214,59 +214,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + @@ -1409,19 +1379,9 @@ - - - - - - - - - - - - - + + + @@ -1772,16 +1732,16 @@ - - - - - + + + + + @@ -2381,14 +2341,9 @@ - - - - - - - - + + + @@ -3657,34 +3612,14 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -3697,16 +3632,6 @@ - - - - - - - - - - @@ -3742,84 +3667,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - + + + @@ -3827,69 +3687,34 @@ - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -3897,39 +3722,19 @@ - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - - - - - + + + @@ -3937,29 +3742,14 @@ - - - - - - - - - - - - - - - - - - + + + - - - + + + 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 aa0f89b4a382f..0edb0763cfd87 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 @@ -458,7 +458,7 @@ protected void mockValidLicenseState() { when(licenseState.isAllowed(InferencePlugin.INFERENCE_API_FEATURE)).thenReturn(true); } - private void mockNodeClient(){ + private void mockNodeClient() { when(nodeClient.getLocalNodeId()).thenReturn(localNodeId); } }