Skip to content

Commit 4da3b6e

Browse files
authored
Merge branch 'master' into andrea.marziali/checker
2 parents d232e66 + 0204feb commit 4da3b6e

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ validate_supported_configurations_v2_local_file:
10021002
extends: .validate_supported_configurations_v2_local_file
10031003
variables:
10041004
LOCAL_JSON_PATH: "metadata/supported-configurations.json"
1005-
BACKFILLED: "true"
1005+
BACKFILLED: "false"
10061006

10071007
update_central_configurations_version_range_v2:
10081008
extends: .update_central_configurations_version_range_v2

dd-java-agent/instrumentation/redisson/redisson-3.10.3/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ muzzle {
55
module = "redisson"
66
versions = "[3.10.3,)"
77
skipVersions += "0.9.0"
8+
skipVersions += "4.0.0" // FIXME: Temporary skip `4.0.0` as we need more time to support it.
89
assertInverse = true
910
}
1011
}

dd-java-agent/instrumentation/spark/spark_2.13/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ muzzle {
1616
group = "org.apache.spark"
1717
module = "spark-sql_$scalaVersion"
1818
versions = "[4.0.0,)"
19+
skipVersions += "4.1.0" // FIXME: Temporary skip `4.1.0` as we need more time to support it.
1920
javaVersion = 17
2021
}
2122
}

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ okhttp = "3.12.15" # Datadog fork to support Java 7
1313

1414
# Languages
1515
## Groovy
16-
groovy = "3.0.24"
16+
groovy = "3.0.25"
1717

1818
## Kotlin
1919
kotlin = "1.6.21"
20-
kotlin-plugin = "1.9.24"
20+
kotlin-plugin = "2.0.21"
2121
kotlinx-coroutines = "1.3.0"
2222

2323
## Scala

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ include(
627627
)
628628

629629
// Optional `akka-http-10.6` instrumentation (see BUILDING.md for how to enable it):
630-
if (providers.gradleProperty("akkaRepositoryToken").isPresent) {
630+
if (providers.gradleProperty("akkaRepositoryToken").getOrElse("").isNotBlank()) {
631631
include(
632632
":dd-java-agent:instrumentation:akka:akka-http:akka-http-10.6"
633633
)

0 commit comments

Comments
 (0)