From fa8da0289910cc4a88031a28385e56814db586d0 Mon Sep 17 00:00:00 2001 From: jasonjkeller Date: Thu, 7 Jul 2022 14:21:11 -0700 Subject: [PATCH] Update dependency and verifier for jsp-2.4 --- instrumentation/jsp-2.4/build.gradle | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/instrumentation/jsp-2.4/build.gradle b/instrumentation/jsp-2.4/build.gradle index d7cd69903e..95e8d17bd1 100644 --- a/instrumentation/jsp-2.4/build.gradle +++ b/instrumentation/jsp-2.4/build.gradle @@ -1,16 +1,26 @@ dependencies { implementation(project(":agent-bridge")) - implementation("javax.servlet:jsp-api:2.0") - implementation("javax.servlet:servlet-api:2.4") + implementation("jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6") + implementation("jakarta.servlet:jakarta.servlet-api:4.0.4") } jar { manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.jsp-2.4' } } +verifyInstrumentation { + passesOnly 'javax.servlet:jsp-api:[2.0,)' + passesOnly 'javax.servlet.jsp:jsp-api:[2.0,)' + passesOnly 'jakarta.servlet.jsp:jakarta.servlet.jsp-api:[2.3.4,3.0.0-M1)' + + exclude 'javax.servlet:jsp-api:2.0.public_draft' + // this version seems to have a bad metadata descriptor + exclude 'javax.servlet.jsp:jsp-api:2.1.2' +} + site { title 'JSP' type 'Other' - versionOverride '[2.0,2.2)' -} \ No newline at end of file + versionOverride '[2.0,3.0)' +}