Merge pull request #910 from newrelic/jsp-jakarta-8

Update dependency and verifier for jsp-2.4
newrelic · Jul 7, 2022 · 80042b1 · 80042b1
2 parents 35e8279 + fa8da02
commit 80042b1
Showing 1 changed file with 14 additions and 4 deletions.
diff --git 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)'
-}
+    versionOverride '[2.0,3.0)'
+}