Skip to content

Commit bf47adc

Browse files
authored
build: make default checkstyle version be updated by dependabot (#216)
* build: make default checkstyle version be updated by dependabot * update version * DEPENDENCIES
1 parent 0fe48ca commit bf47adc

File tree

5 files changed

+37
-20
lines changed

5 files changed

+37
-20
lines changed

DEPENDENCIES

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,33 @@ maven/mavencentral/com.github.java-json-tools/json-schema-validator/2.2.8, Apach
2525
maven/mavencentral/com.google.code.findbugs/jsr305/2.0.1, BSD-3-Clause AND CC-BY-2.5 AND LGPL-2.1+, approved, CQ13390
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
28+
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
2830
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.2.0, Apache-2.0, approved, clearlydefined
2931
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.7.1, Apache-2.0, approved, clearlydefined
3032
maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654
3133
maven/mavencentral/com.google.guava/guava/16.0.1, Apache-2.0, approved, clearlydefined
3234
maven/mavencentral/com.google.guava/guava/27.0.1-android, Apache-2.0, approved, CQ18308
3335
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
3437
maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
3538
maven/mavencentral/com.google.j2objc/j2objc-annotations/1.1, Apache-2.0, approved, CQ18765
3639
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
3741
maven/mavencentral/com.googlecode.libphonenumber/libphonenumber/8.0.0, Apache-2.0, approved, clearlydefined
38-
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.0, LGPL-2.1-or-later, approved, #7936
42+
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.12.3, LGPL-2.1+, restricted, clearlydefined
3943
maven/mavencentral/com.rameshkp/openapi-merger-app/1.0.5, Apache-2.0, approved, clearlydefined
4044
maven/mavencentral/com.rameshkp/openapi-merger-gradle-plugin/1.0.5, Apache-2.0, approved, #9669
4145
maven/mavencentral/commons-beanutils/commons-beanutils/1.9.4, Apache-2.0, approved, CQ12654
46+
maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0 AND BSD-3-Clause, approved, CQ15971
47+
maven/mavencentral/commons-codec/commons-codec/1.15, Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, CQ22641
4248
maven/mavencentral/commons-codec/commons-codec/1.9, Apache-2.0, approved, CQ10595
4349
maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, CQ10385
4450
maven/mavencentral/commons-io/commons-io/2.4, Apache-1.1, approved, CQ9218
4551
maven/mavencentral/commons-io/commons-io/2.6, Apache-2.0, approved, CQ19090
4652
maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
4753
maven/mavencentral/gradle.plugin.org.gradle.crypto/checksum/1.4.0, Apache-2.0, approved, #9667
48-
maven/mavencentral/info.picocli/picocli/4.6.3, Apache-2.0, approved, clearlydefined
54+
maven/mavencentral/info.picocli/picocli/4.7.4, Apache-2.0, approved, #4365
4955
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
5056
maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.1.5, Apache-2.0, approved, clearlydefined
5157
maven/mavencentral/io.swagger.core.v3/swagger-core/2.1.5, Apache-2.0, approved, clearlydefined
@@ -74,19 +80,38 @@ maven/mavencentral/joda-time/joda-time/2.9.7, Apache-2.0, approved, CQ11988
7480
maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.11, Apache-2.0, approved, #7164
7581
maven/mavencentral/net.bytebuddy/byte-buddy/1.14.11, Apache-2.0 AND BSD-3-Clause, approved, #7163
7682
maven/mavencentral/net.sf.jopt-simple/jopt-simple/5.0.3, MIT, approved, CQ13174
77-
maven/mavencentral/net.sf.saxon/Saxon-HE/10.6, MPL-2.0 AND W3C, approved, #7945
83+
maven/mavencentral/net.sf.saxon/Saxon-HE/12.3, NOASSERTION, restricted, clearlydefined
7884
maven/mavencentral/net.steppschuh.markdowngenerator/markdowngenerator/1.3.1.1, Apache-2.0, approved, clearlydefined
79-
maven/mavencentral/org.antlr/antlr4-runtime/4.9.3, BSD-3-Clause, approved, #322
85+
maven/mavencentral/org.antlr/antlr4-runtime/4.11.1, BSD-3-Clause, approved, clearlydefined
8086
maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined
8187
maven/mavencentral/org.apache.commons/commons-lang3/3.2.1, Apache-2.0, approved, clearlydefined
8288
maven/mavencentral/org.apache.commons/commons-lang3/3.7, Apache-2.0, approved, clearlydefined
89+
maven/mavencentral/org.apache.commons/commons-lang3/3.8.1, Apache-2.0, approved, #815
90+
maven/mavencentral/org.apache.commons/commons-text/1.3, Apache-2.0, approved, clearlydefined
91+
maven/mavencentral/org.apache.httpcomponents.client5/httpclient5/5.1.3, Apache-2.0, approved, #6276
92+
maven/mavencentral/org.apache.httpcomponents.core5/httpcore5-h2/5.1.3, Apache-2.0, approved, clearlydefined
93+
maven/mavencentral/org.apache.httpcomponents.core5/httpcore5/5.1.3, Apache-2.0, approved, clearlydefined
94+
maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23527
8395
maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.2, Apache-2.0, approved, CQ11713
96+
maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.13, Apache-2.0, approved, CQ23528
97+
maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.14, Apache-2.0, approved, CQ23528
8498
maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.4, Apache-2.0, approved, CQ11716
99+
maven/mavencentral/org.apache.maven.doxia/doxia-core/1.12.0, Apache-2.0, approved, clearlydefined
100+
maven/mavencentral/org.apache.maven.doxia/doxia-logging-api/1.12.0, Apache-2.0, approved, clearlydefined
101+
maven/mavencentral/org.apache.maven.doxia/doxia-module-xdoc/1.12.0, Apache-2.0, approved, clearlydefined
102+
maven/mavencentral/org.apache.maven.doxia/doxia-sink-api/1.12.0, Apache-2.0, approved, clearlydefined
103+
maven/mavencentral/org.apache.xbean/xbean-reflect/3.7, Apache-2.0, approved, clearlydefined
85104
maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
86105
maven/mavencentral/org.assertj/assertj-core/3.25.1, Apache-2.0, approved, #12585
87106
maven/mavencentral/org.checkerframework/checker-compat-qual/2.5.2, GPL-2.0-only with Classpath-Exception-2.0, approved, #11598
88107
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
89109
maven/mavencentral/org.codehaus.mojo/animal-sniffer-annotations/1.17, MIT, approved, clearlydefined
110+
maven/mavencentral/org.codehaus.plexus/plexus-classworlds/2.6.0, Apache-2.0 AND Plexus, approved, CQ22821
111+
maven/mavencentral/org.codehaus.plexus/plexus-component-annotations/2.1.0, Apache-2.0, approved, #809
112+
maven/mavencentral/org.codehaus.plexus/plexus-container-default/2.1.0, Apache-2.0, approved, clearlydefined
113+
maven/mavencentral/org.codehaus.plexus/plexus-utils/3.1.1, , approved, CQ16492
114+
maven/mavencentral/org.codehaus.plexus/plexus-utils/3.3.0, , approved, CQ21066
90115
maven/mavencentral/org.eclipse.edc/autodoc-processor/0.5.1-SNAPSHOT, Apache-2.0, approved, technology.edc
91116
maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.5.1-SNAPSHOT, Apache-2.0, approved, technology.edc
92117
maven/mavencentral/org.glassfish.web/javax.el/2.2.6, CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #1654
@@ -122,4 +147,5 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.25, MIT, approved, CQ13368
122147
maven/mavencentral/org.slf4j/slf4j-api/1.7.28, MIT, approved, CQ13368
123148
maven/mavencentral/org.slf4j/slf4j-api/1.7.30, MIT, approved, CQ13368
124149
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
125151
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

build.gradle.kts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,10 @@ allprojects {
3535
}
3636
}
3737

38-
// configure checkstyle version
3938
checkstyle {
40-
toolVersion = "10.0"
4139
maxErrors = 0 // does not tolerate errors
4240
}
4341

44-
// let's not generate any reports because that is done from within the Github Actions workflow
45-
tasks.withType<Checkstyle> {
46-
reports {
47-
html.required.set(false)
48-
xml.required.set(true)
49-
}
50-
}
51-
5242
tasks.withType<Jar> {
5343
duplicatesStrategy = DuplicatesStrategy.INCLUDE
5444

buildSrc/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ gradlePlugin {
4141
}
4242
}
4343

44-
val generatedSourcesFolder = buildDir.resolve("generated").resolve("sources");
44+
val generatedSourcesFolder = layout.buildDirectory.asFile.get().resolve("generated").resolve("sources");
4545

4646
sourceSets {
4747
main {
@@ -74,10 +74,10 @@ val createVersions = tasks.register("createVersions") {
7474
val head = "package org.eclipse.edc.plugins.edcbuild;\npublic interface Versions {\n"
7575
val tail = "\n}";
7676

77-
val constants = listOf("jupiter", "mockito", "assertj")
77+
val constants = listOf("assertj", "checkstyle", "jupiter", "mockito")
7878
.mapNotNull { name ->
7979
catalog.findVersion(name)
80-
.map { version -> " String %s = \"%s\";".format(name.toUpperCase(), version) }
80+
.map { version -> " String %s = \"%s\";".format(name.uppercase(), version) }
8181
.orElse(null)
8282
}
8383
.joinToString("\n", head, tail)

gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ format.version = "1.1"
33

44
[versions]
55
assertj = "3.25.1"
6+
checkstyle = "10.12.3"
67
edc = "0.5.1-SNAPSHOT"
78
jackson = "2.16.0"
89
jetbrainsAnnotation = "24.0.1"
@@ -11,6 +12,7 @@ mockito = "5.9.0"
1112

1213
[libraries]
1314
assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" }
15+
checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }
1416
edc-runtime-metamodel = { module = "org.eclipse.edc:runtime-metamodel", version.ref = "edc" }
1517
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
1618
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
package org.eclipse.edc.plugins.edcbuild.conventions;
1616

17+
import org.eclipse.edc.plugins.edcbuild.Versions;
1718
import org.gradle.api.Project;
1819
import org.gradle.api.plugins.quality.Checkstyle;
1920
import org.gradle.api.plugins.quality.CheckstyleExtension;
@@ -30,13 +31,11 @@
3031
*/
3132
class CheckstyleConvention implements EdcConvention {
3233

33-
private static final String DEFAULT_TOOL_VERSION = "10.0";
34-
3534
@Override
3635
public void apply(Project target) {
3736
var cse = requireExtension(target, CheckstyleExtension.class);
3837

39-
cse.setToolVersion(DEFAULT_TOOL_VERSION);
38+
cse.setToolVersion(Versions.CHECKSTYLE);
4039
cse.setMaxErrors(0);
4140
target.getTasks().withType(Checkstyle.class, cs -> cs.reports(r -> {
4241
r.getHtml().getRequired().set(false);

0 commit comments

Comments
 (0)