From beabda6d963d0917e46bd0907568730a9aff04cd Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 8 Aug 2022 17:39:06 -0700 Subject: [PATCH] Fix the build (#6445) --- instrumentation/apache-camel-2.20/javaagent/build.gradle.kts | 4 ++-- .../aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts | 2 ++ instrumentation/grails-3.0/javaagent/build.gradle.kts | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts b/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts index fd32971566..4747ef8641 100644 --- a/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts +++ b/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts @@ -6,12 +6,12 @@ muzzle { pass { group.set("org.apache.camel") module.set("camel-core") - versions.set("[2.20,3)") + versions.set("[2.19,3)") assertInverse.set(true) } } -val camelversion = "2.20.1" +val camelversion = "2.20.1" // first version that the tests pass on val versions: Map by project dependencies { diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts index fa013305f4..d61c7d41c8 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts @@ -10,6 +10,8 @@ muzzle { // Used by all SDK services, the only case it isn't is an SDK extension such as a custom HTTP // client, which is not target of instrumentation anyways. extraDependency("software.amazon.awssdk:protocol-core") + // several software.amazon.awssdk artifacts are missing for this version + skip("2.17.200") } } diff --git a/instrumentation/grails-3.0/javaagent/build.gradle.kts b/instrumentation/grails-3.0/javaagent/build.gradle.kts index 8755edafcc..08a6ad9c3f 100644 --- a/instrumentation/grails-3.0/javaagent/build.gradle.kts +++ b/instrumentation/grails-3.0/javaagent/build.gradle.kts @@ -13,13 +13,12 @@ muzzle { // which (also obviously) does not exist skip("3.1.15", "3.3.6") // these versions pass if you add the grails maven repository (https://repo.grails.org/artifactory/core) - skip("3.2.0", "3.3.0", "3.3.1", "3.3.2", "3.3.3", "4.0.0", "4.0.1", "4.0.5", "4.0.6", "4.0.7", "4.0.8", "4.0.9") + skip("3.2.0", "3.3.0", "3.3.1", "3.3.2", "3.3.3", "3.3.10", "3.3.13", "3.3.14", "3.3.15", "4.0.0", "4.0.1", "4.0.5", "4.0.6", "4.0.7", "4.0.8", "4.0.9", "4.0.10", "4.0.11", "4.0.12", "4.0.13") assertInverse.set(true) } } -// first version where our tests work -val grailsVersion = "3.0.6" +val grailsVersion = "3.0.6" // first version that the tests pass on val springBootVersion = "1.2.5.RELEASE" dependencies {