From b8ffecaf64c9158777e9aaa66d03aec8075706e9 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Mon, 1 Jul 2024 16:18:54 +0200 Subject: [PATCH] Revert "fix(deps): update groovy monorepo (main) (patch) (#11706)" This reverts commit 40670fba09799e71848111f577f58bc6205b4539. --- conventions/src/main/kotlin/otel.java-conventions.gradle.kts | 2 +- dependencyManagement/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts index 2662535de894..22f9f28b170e 100644 --- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts @@ -161,7 +161,7 @@ dependencies { compileOnly("com.google.errorprone:error_prone_annotations") codenarc("org.codenarc:CodeNarc:3.4.0") - codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.22")) + codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.21")) modules { // checkstyle uses the very old google-collections which causes Java 9 module conflict with diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 85e4aa3c1844..0d8326ae82b7 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -13,7 +13,7 @@ val otelContribVersion = "1.36.0-alpha" val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") // Need both BOM and groovy jars -val groovyVersion = "4.0.22" +val groovyVersion = "4.0.21" // We don't force libraries we instrument to new versions since we compile and test against specific // old baseline versions but we do try to force those libraries' transitive dependencies to new