(jmeter) branch master updated: fix(deps): update dependency checkstyle to v10.12.6

[vladimirsitnikov]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new a6bc6574f2 fix(deps): update dependency checkstyle to v10.12.6
a6bc6574f2 is described below

commit a6bc6574f247c8d212ecb3e2bde1172e415c870e
Author: Mend Renovate <b...@renovateapp.com>
AuthorDate: Thu Dec 14 15:53:29 2023 +0000

    fix(deps): update dependency checkstyle to v10.12.6
    
    Fixes https://github.com/apache/jmeter/pull/6177
---
 .../src/main/kotlin/build-logic.checkstyle.gradle.kts          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts 
b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index 44ef221da6..2012ca9dec 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -23,11 +23,19 @@ plugins {
     id("checkstyle")
 }
 
+configurations.checkstyle {
+    // See 
https://github.com/gradle/gradle/issues/27035#issuecomment-1814997295
+    // TODO: remove the workaround as 
https://github.com/checkstyle/checkstyle/issues/14123 is resolved
+    
resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections")
 {
+        select("com.google.guava:guava:0")
+    }
+}
+
 checkstyle {
     // TOOD: move to /config
     val configDir = File(rootDir, "config/checkstyle")
 
-    toolVersion = "10.12.5"
+    toolVersion = "10.12.6"
     configProperties = mapOf(
         "cache_file" to 
layout.buildDirectory.dir("checkstyle/cacheFile").get().asFile.relativeTo(configDir)
     )