From 3f83dbb7e8923c10d266435073978ed4497f7855 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 16 Oct 2025 09:02:44 +0300 Subject: [PATCH 1/5] Fix latest dep tests --- .../jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts index 2985fd0046c5..59b3f3864e86 100644 --- a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts @@ -17,7 +17,11 @@ otelJava { } dependencies { - library("jakarta.el:jakarta.el-api:4.0.0") + // can't use library for now because 6.1.0-M1 is latest and its POM referes to a missing parent POM + // switch back to library when a new version is released + // library("jakarta.el:jakarta.el-api:4.0.0") + compileOnly("jakarta.el:jakarta.el-api:4.0.0") + testImplementation("jakarta.el:jakarta.el-api:4.0.0") library("jakarta.faces:jakarta.faces-api:3.0.0") testLibrary("org.glassfish:jakarta.faces:3.0.4") From 3bbe2aabb7bdff57f2097da00076aa5fd00d0b3b Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 16 Oct 2025 09:10:19 +0300 Subject: [PATCH 2/5] Fix latest dep tests --- .../jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts index ff215c68b8f4..2adc2f0c1c56 100644 --- a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts @@ -17,7 +17,11 @@ otelJava { } dependencies { - library("jakarta.el:jakarta.el-api:4.0.0") + // can't use library for now because 6.1.0-M1 is latest and its POM referes to a missing parent POM + // switch back to library when a new version is released + // library("jakarta.el:jakarta.el-api:4.0.0") + compileOnly("jakarta.el:jakarta.el-api:4.0.0") + testImplementation("jakarta.el:jakarta.el-api:4.0.0") library("org.apache.myfaces.core:myfaces-api:3.0.2") testLibrary("org.apache.myfaces.core:myfaces-impl:3.0.2") From 15e8db7bee1772f1cf06ac67ce6d9e13a90a014f Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 16 Oct 2025 10:22:44 +0300 Subject: [PATCH 3/5] fix --- .../spring-security-config-6.0/javaagent/build.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts index d23da79c852c..be8a14b7ff3f 100644 --- a/instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts @@ -23,7 +23,11 @@ dependencies { testLibrary("org.springframework:spring-test:6.0.0") testLibrary("org.springframework:spring-context:6.0.0") - testLibrary("jakarta.servlet:jakarta.servlet-api:6.0.0") + // not using testLibrary because of missing parent POM in 6.2.0-M1, switch back to testLibrary + // when a new version is released + // testLibrary("jakarta.servlet:jakarta.servlet-api:6.0.0") + testImplementation("jakarta.servlet:jakarta.servlet-api:6.0.0") + latestDepTestLibrary("jakarta.servlet:jakarta.servlet-api:6.1.0") // documented limitation } otelJava { From 8f428d71f38aae3a1560a9e33f2cd73ebdef02b8 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 16 Oct 2025 10:34:19 +0300 Subject: [PATCH 4/5] fix --- .../jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts | 1 + .../jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts | 1 + .../spring-security-config-6.0/javaagent/build.gradle.kts | 4 ++-- .../spring-security-config-6.0/library/build.gradle.kts | 7 ++++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts index 59b3f3864e86..d7cdf7f68790 100644 --- a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { // library("jakarta.el:jakarta.el-api:4.0.0") compileOnly("jakarta.el:jakarta.el-api:4.0.0") testImplementation("jakarta.el:jakarta.el-api:4.0.0") + latestDepTestLibrary("jakarta.el:jakarta.el-api:5.+") // documented limitation library("jakarta.faces:jakarta.faces-api:3.0.0") testLibrary("org.glassfish:jakarta.faces:3.0.4") diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts index 2adc2f0c1c56..48e39f07f88b 100644 --- a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { // library("jakarta.el:jakarta.el-api:4.0.0") compileOnly("jakarta.el:jakarta.el-api:4.0.0") testImplementation("jakarta.el:jakarta.el-api:4.0.0") + latestDepTestLibrary("jakarta.el:jakarta.el-api:5.+") // documented limitation library("org.apache.myfaces.core:myfaces-api:3.0.2") testLibrary("org.apache.myfaces.core:myfaces-impl:3.0.2") diff --git a/instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts index be8a14b7ff3f..b0e2cca61140 100644 --- a/instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts @@ -23,8 +23,8 @@ dependencies { testLibrary("org.springframework:spring-test:6.0.0") testLibrary("org.springframework:spring-context:6.0.0") - // not using testLibrary because of missing parent POM in 6.2.0-M1, switch back to testLibrary - // when a new version is released + // can't use testLibrary for now because 6.2.0-M1 is latest and its POM referes to a missing + // parent POM, switch back to testLibrary when a new version is released // testLibrary("jakarta.servlet:jakarta.servlet-api:6.0.0") testImplementation("jakarta.servlet:jakarta.servlet-api:6.0.0") latestDepTestLibrary("jakarta.servlet:jakarta.servlet-api:6.1.0") // documented limitation diff --git a/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts b/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts index 60bf1e859fa5..3641847ecf5f 100644 --- a/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts +++ b/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts @@ -7,7 +7,12 @@ dependencies { library("org.springframework.security:spring-security-web:6.0.0") library("org.springframework:spring-web:6.0.0") library("io.projectreactor:reactor-core:3.5.0") - library("jakarta.servlet:jakarta.servlet-api:6.0.0") + // can't use library for now because 6.2.0-M1 is latest and its POM referes to a missing parent POM + // switch back to library when a new version is released + // library("jakarta.servlet:jakarta.servlet-api:6.0.0") + compileOnly("jakarta.servlet:jakarta.servlet-api:6.0.0") + testImplementation("jakarta.servlet:jakarta.servlet-api:6.0.0") + latestDepTestLibrary("jakarta.servlet:jakarta.servlet-api:6.1.0") // documented limitation implementation(project(":instrumentation:reactor:reactor-3.1:library")) From 4fac48785915e14a838f9496e0a170d75f739a9d Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 16 Oct 2025 10:43:38 +0300 Subject: [PATCH 5/5] fix --- instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts | 1 - instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts | 1 - 2 files changed, 2 deletions(-) diff --git a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts index d7cdf7f68790..59b3f3864e86 100644 --- a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts @@ -22,7 +22,6 @@ dependencies { // library("jakarta.el:jakarta.el-api:4.0.0") compileOnly("jakarta.el:jakarta.el-api:4.0.0") testImplementation("jakarta.el:jakarta.el-api:4.0.0") - latestDepTestLibrary("jakarta.el:jakarta.el-api:5.+") // documented limitation library("jakarta.faces:jakarta.faces-api:3.0.0") testLibrary("org.glassfish:jakarta.faces:3.0.4") diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts index 48e39f07f88b..2adc2f0c1c56 100644 --- a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts @@ -22,7 +22,6 @@ dependencies { // library("jakarta.el:jakarta.el-api:4.0.0") compileOnly("jakarta.el:jakarta.el-api:4.0.0") testImplementation("jakarta.el:jakarta.el-api:4.0.0") - latestDepTestLibrary("jakarta.el:jakarta.el-api:5.+") // documented limitation library("org.apache.myfaces.core:myfaces-api:3.0.2") testLibrary("org.apache.myfaces.core:myfaces-impl:3.0.2")