Skip to content

Commit cb1d527

Browse files
build(deps): bump com.puppycrawl.tools:checkstyle from 10.12.3 to 10.13.0 (#217)
* build(deps): bump com.puppycrawl.tools:checkstyle Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.12.3 to 10.13.0. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](checkstyle/checkstyle@checkstyle-10.12.3...checkstyle-10.13.0) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * apply workaround * update dependencies --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ndr_brt <[email protected]>
1 parent 5c87a89 commit cb1d527

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed

DEPENDENCIES

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ maven/mavencentral/com.google.code.findbugs/jsr305/2.0.1, BSD-3-Clause AND CC-BY
2626
maven/mavencentral/com.google.code.findbugs/jsr305/3.0.1, Apache-2.0, approved, #20
2727
maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20
2828
maven/mavencentral/com.google.collections/google-collections/1.0, Apache-2.0, approved, CQ3285
29-
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.18.0, Apache-2.0, approved, clearlydefined
3029
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.2.0, Apache-2.0, approved, clearlydefined
30+
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.23.0, Apache-2.0, approved, #11083
3131
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.7.1, Apache-2.0, approved, clearlydefined
3232
maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654
33+
maven/mavencentral/com.google.guava/failureaccess/1.0.2, Apache-2.0, approved, CQ22654
3334
maven/mavencentral/com.google.guava/guava/16.0.1, Apache-2.0, approved, clearlydefined
3435
maven/mavencentral/com.google.guava/guava/27.0.1-android, Apache-2.0, approved, CQ18308
3536
maven/mavencentral/com.google.guava/guava/31.0.1-jre, Apache-2.0, approved, clearlydefined
36-
maven/mavencentral/com.google.guava/guava/32.0.1-jre, Apache-2.0 AND CC0-1.0 AND CC-PDDC, approved, #8772
37+
maven/mavencentral/com.google.guava/guava/33.0.0-jre, Apache-2.0 AND CC0-1.0, approved, #12173
3738
maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
3839
maven/mavencentral/com.google.j2objc/j2objc-annotations/1.1, Apache-2.0, approved, CQ18765
3940
maven/mavencentral/com.google.j2objc/j2objc-annotations/1.3, Apache-2.0, approved, CQ21195
40-
maven/mavencentral/com.google.j2objc/j2objc-annotations/2.8, Apache-2.0, approved, clearlydefined
4141
maven/mavencentral/com.googlecode.libphonenumber/libphonenumber/8.0.0, Apache-2.0, approved, clearlydefined
42-
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.12.3, LGPL-2.1-only AND Apache-2.0 AND LGPL-2.1-or-later AND ANTLR-PD AND GPL-2.0-or-later AND LGPL-2.0-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND LicenseRef-scancode-proprietary-license, restricted, #13190
42+
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.13.0, , restricted, clearlydefined
4343
maven/mavencentral/com.rameshkp/openapi-merger-app/1.0.5, Apache-2.0, approved, clearlydefined
4444
maven/mavencentral/com.rameshkp/openapi-merger-gradle-plugin/1.0.5, Apache-2.0, approved, #9669
4545
maven/mavencentral/commons-beanutils/commons-beanutils/1.9.4, Apache-2.0, approved, CQ12654
@@ -51,7 +51,7 @@ maven/mavencentral/commons-io/commons-io/2.4, Apache-1.1, approved, CQ9218
5151
maven/mavencentral/commons-io/commons-io/2.6, Apache-2.0, approved, CQ19090
5252
maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
5353
maven/mavencentral/gradle.plugin.org.gradle.crypto/checksum/1.4.0, Apache-2.0, approved, #9667
54-
maven/mavencentral/info.picocli/picocli/4.7.4, Apache-2.0, approved, #4365
54+
maven/mavencentral/info.picocli/picocli/4.7.5, Apache-2.0, approved, #4365
5555
maven/mavencentral/io.github.gradle-nexus/publish-plugin/1.3.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause AND CPL-1.0 AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Permission-Notice), approved, #10359
5656
maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.1.5, Apache-2.0, approved, clearlydefined
5757
maven/mavencentral/io.swagger.core.v3/swagger-core/2.1.5, Apache-2.0, approved, clearlydefined
@@ -80,9 +80,9 @@ maven/mavencentral/joda-time/joda-time/2.9.7, Apache-2.0, approved, CQ11988
8080
maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.11, Apache-2.0, approved, #7164
8181
maven/mavencentral/net.bytebuddy/byte-buddy/1.14.11, Apache-2.0 AND BSD-3-Clause, approved, #7163
8282
maven/mavencentral/net.sf.jopt-simple/jopt-simple/5.0.3, MIT, approved, CQ13174
83-
maven/mavencentral/net.sf.saxon/Saxon-HE/12.3, MPL-2.0-no-copyleft-exception AND (LicenseRef-scancode-proprietary-license AND MPL-2.0-no-copyleft-exception) AND (MPL-2.0-no-copyleft-exception AND X11) AND (MIT AND MPL-2.0-no-copyleft-exception) AND (MPL-1.0 AND MPL-2.0-no-copyleft-exception) AND (Apache-2.0 AND MPL-2.0-no-copyleft-exception) AND MPL-1.0, restricted, #13191
83+
maven/mavencentral/net.sf.saxon/Saxon-HE/12.4, MPL-2.0 AND (MPL-2.0 AND Apache-2.0) AND (MPL-2.0 AND LicenseRef-X11-style) AND MPL-1.0 AND W3C, approved, #12716
8484
maven/mavencentral/net.steppschuh.markdowngenerator/markdowngenerator/1.3.1.1, Apache-2.0, approved, clearlydefined
85-
maven/mavencentral/org.antlr/antlr4-runtime/4.11.1, BSD-3-Clause, approved, clearlydefined
85+
maven/mavencentral/org.antlr/antlr4-runtime/4.13.1, BSD-3-Clause, approved, #10767
8686
maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined
8787
maven/mavencentral/org.apache.commons/commons-lang3/3.2.1, Apache-2.0, approved, clearlydefined
8888
maven/mavencentral/org.apache.commons/commons-lang3/3.7, Apache-2.0, approved, clearlydefined
@@ -105,7 +105,8 @@ maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved,
105105
maven/mavencentral/org.assertj/assertj-core/3.25.3, Apache-2.0, approved, #12585
106106
maven/mavencentral/org.checkerframework/checker-compat-qual/2.5.2, GPL-2.0-only with Classpath-Exception-2.0, approved, #11598
107107
maven/mavencentral/org.checkerframework/checker-qual/3.12.0, MIT, approved, clearlydefined
108-
maven/mavencentral/org.checkerframework/checker-qual/3.27.0, MIT, approved, clearlydefined
108+
maven/mavencentral/org.checkerframework/checker-qual/3.41.0, MIT, approved, #12032
109+
maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined
109110
maven/mavencentral/org.codehaus.mojo/animal-sniffer-annotations/1.17, MIT, approved, clearlydefined
110111
maven/mavencentral/org.codehaus.plexus/plexus-classworlds/2.6.0, Apache-2.0 AND Plexus, approved, CQ22821
111112
maven/mavencentral/org.codehaus.plexus/plexus-component-annotations/2.1.0, Apache-2.0, approved, #809
@@ -147,5 +148,5 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.25, MIT, approved, CQ13368
147148
maven/mavencentral/org.slf4j/slf4j-api/1.7.28, MIT, approved, CQ13368
148149
maven/mavencentral/org.slf4j/slf4j-api/1.7.30, MIT, approved, CQ13368
149150
maven/mavencentral/org.slf4j/slf4j-ext/1.7.28, MIT, approved, CQ9128
150-
maven/mavencentral/org.xmlresolver/xmlresolver/5.2.0, Apache-2.0, approved, clearlydefined
151+
maven/mavencentral/org.xmlresolver/xmlresolver/5.2.2, Apache-2.0, approved, clearlydefined
151152
maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ format.version = "1.1"
33

44
[versions]
55
assertj = "3.25.3"
6-
checkstyle = "10.12.3"
6+
checkstyle = "10.13.0"
77
edc = "0.5.2-SNAPSHOT"
88
jackson = "2.16.0"
99
jetbrainsAnnotation = "24.0.1"

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/CheckstyleConvention.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ class CheckstyleConvention implements EdcConvention {
3535
public void apply(Project target) {
3636
var extension = requireExtension(target, CheckstyleExtension.class);
3737

38+
guavaWorkaround(target);
39+
3840
extension.setToolVersion(Versions.CHECKSTYLE);
3941
extension.setMaxErrors(0);
4042
extension.setMaxWarnings(0);
@@ -44,4 +46,14 @@ public void apply(Project target) {
4446
r.getXml().getRequired().set(true);
4547
}));
4648
}
49+
50+
/**
51+
* Ref. <a href="https://github.com/gradle/gradle/issues/27035#issuecomment-1814589243">https://github.com/gradle/gradle/issues/27035#issuecomment-1814589243</a>
52+
*
53+
* @param target the project.
54+
*/
55+
private static void guavaWorkaround(Project target) {
56+
target.getConfigurations().getByName("checkstyle").getResolutionStrategy().getCapabilitiesResolution()
57+
.withCapability("com.google.collections:google-collections", details -> details.select("com.google.guava:guava:0"));
58+
}
4759
}

0 commit comments

Comments
 (0)