From edc491d8c1c8882b701436f60e930b57fb4f609b Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 29 May 2025 08:50:51 +0300 Subject: [PATCH 1/2] Fix camel muzzle failure --- instrumentation/camel-2.20/javaagent/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instrumentation/camel-2.20/javaagent/build.gradle.kts b/instrumentation/camel-2.20/javaagent/build.gradle.kts index eaa9bb52dfae..6d9a9034c0d2 100644 --- a/instrumentation/camel-2.20/javaagent/build.gradle.kts +++ b/instrumentation/camel-2.20/javaagent/build.gradle.kts @@ -8,6 +8,8 @@ muzzle { module.set("camel-core") versions.set("[2.19,3)") assertInverse.set(true) + // https://repo.maven.apache.org/maven2/org/apache/camel/core/4.12.0/core-4.12.0.pom is missing + skip("4.12.0") } } From 222cc6ba3db785360043d5b158c942e7e745772b Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 29 May 2025 09:25:46 +0300 Subject: [PATCH 2/2] hopefully fix latest dep tests --- instrumentation/camel-2.20/javaagent/build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instrumentation/camel-2.20/javaagent/build.gradle.kts b/instrumentation/camel-2.20/javaagent/build.gradle.kts index 6d9a9034c0d2..f989bd74af05 100644 --- a/instrumentation/camel-2.20/javaagent/build.gradle.kts +++ b/instrumentation/camel-2.20/javaagent/build.gradle.kts @@ -18,7 +18,7 @@ val camelversion = "2.20.1" // first version that the tests pass on description = "camel-2-20" dependencies { - library("org.apache.camel:camel-core:$camelversion") + compileOnly("org.apache.camel:camel-core:$camelversion") implementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator") // without adding this dependency, javadoc fails: @@ -35,6 +35,7 @@ dependencies { testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:aws-sdk:aws-sdk-1.11:javaagent")) + testImplementation("org.apache.camel:camel-core:$camelversion") testImplementation("org.apache.camel:camel-spring-boot-starter:$camelversion") testImplementation("org.apache.camel:camel-jetty-starter:$camelversion") testImplementation("org.apache.camel:camel-http-starter:$camelversion")