diff --git a/build-conventions/build.gradle b/build-conventions/build.gradle index 520cb1e5d9b5..b0eda5a34065 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.500") { + api("org.eclipse.platform:org.eclipse.osgi:3.18.300") { 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 ef3ffb2caa2d..9e470e210fe2 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:7.0.2" +spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0" 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 1cf29874e459..9c39b0ec396f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -214,29 +214,59 @@ + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1379,9 +1409,19 @@ - - - + + + + + + + + + + + + + @@ -1732,16 +1772,16 @@ + + + + + - - - - - @@ -2341,9 +2381,14 @@ - - - + + + + + + + + @@ -3612,14 +3657,34 @@ - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3632,6 +3697,16 @@ + + + + + + + + + + @@ -3667,19 +3742,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3687,34 +3827,69 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3722,19 +3897,39 @@ - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3742,14 +3937,29 @@ - - - + + + - - - + + + + + + + + + + + + + + + + + +