Skip to content

Commit 82c0acf

Browse files
authored
Merge branch 'main' into renovate/errorproneversion
2 parents b5972b6 + 83d1cad commit 82c0acf

File tree

30 files changed

+1613
-98
lines changed

30 files changed

+1613
-98
lines changed

.github/renovate.json5

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,26 @@
159159
'com.github.tomakehurst:wiremock-jre8'
160160
],
161161
},
162+
{
163+
// snakeyaml-engine 3+ requires Java 11+
164+
matchUpdateTypes: [
165+
'major',
166+
],
167+
enabled: false,
168+
matchPackageNames: [
169+
'org.snakeyaml:snakeyaml-engine'
170+
],
171+
},
172+
{
173+
// groovy 5+ requires Java 11+
174+
matchUpdateTypes: [
175+
'major',
176+
],
177+
enabled: false,
178+
matchPackageNames: [
179+
'org.apache.groovy:**'
180+
],
181+
},
162182
{
163183
// vaadin 14 tests require node 16
164184
matchPackageNames: [

conventions/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
6464
implementation("org.spdx:spdx-gradle-plugin:0.9.0")
6565
// When updating, also update dependencyManagement/build.gradle.kts
66-
implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.18.0")
66+
implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.18.1")
6767
implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
6868
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
6969
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ codenarc {
422422
checkstyle {
423423
configFile = rootProject.file("buildscripts/checkstyle.xml")
424424
// this version should match the version of google_checks.xml used as basis for above configuration
425-
toolVersion = "12.1.1"
425+
toolVersion = "12.1.2"
426426
maxWarnings = 0
427427
}
428428

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ val DEPENDENCY_BOMS = listOf(
3838
val autoServiceVersion = "1.1.1"
3939
val autoValueVersion = "1.11.1"
4040
val errorProneVersion = "2.44.0"
41-
val byteBuddyVersion = "1.18.0"
41+
val byteBuddyVersion = "1.18.1"
4242
val asmVersion = "9.9"
4343
val jmhVersion = "1.37"
4444
val mockitoVersion = "4.11.0"
@@ -87,7 +87,7 @@ val DEPENDENCIES = listOf(
8787
"uk.org.webcompere:system-stubs-jupiter:2.0.3",
8888
"com.uber.nullaway:nullaway:0.12.12",
8989
"commons-beanutils:commons-beanutils:1.11.0",
90-
"commons-cli:commons-cli:1.10.0",
90+
"commons-cli:commons-cli:1.11.0",
9191
"commons-codec:commons-codec:1.20.0",
9292
"commons-collections:commons-collections:3.2.2",
9393
"commons-digester:commons-digester:2.1",

0 commit comments

Comments
 (0)