Merge pull request #914 from newrelic/jms-jakarta

Update jms dependency and verifier
newrelic · Jul 8, 2022 · de9d928 · de9d928
2 parents 9762700 + b51c456
commit de9d928
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/instrumentation/jms-1.1/build.gradle b/instrumentation/jms-1.1/build.gradle
@@ -1,11 +1,12 @@
 dependencies {
     implementation(project(":agent-bridge"))
-    implementation("javax.jms:jms-api:1.1-rev-1")
+    implementation 'jakarta.jms:jakarta.jms-api:2.0.3'
 
-    testImplementation("org.apache.activemq:activemq-broker:5.8.0")
-    testImplementation("org.hornetq:hornetq-core-client:2.3.0.Final")
-    testImplementation("org.hornetq:hornetq-jms-client:2.3.0.Final")
-    testImplementation("org.hornetq:hornetq-jms-server:2.3.0.Final") {
+    // org.apache.activemq:activemq-broker:5.17.0 and above requires Java 11
+    testImplementation('org.apache.activemq:activemq-broker:5.16.5')
+    testImplementation("org.hornetq:hornetq-core-client:2.4.9.Final")
+    testImplementation("org.hornetq:hornetq-jms-client:2.4.9.Final")
+    testImplementation("org.hornetq:hornetq-jms-server:2.4.9.Final") {
         exclude(group: "org.jboss.naming", module: "jnpserver")
     }
 }
@@ -14,8 +15,13 @@ jar {
     manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.jms-1.1' }
 }
 
+verifyInstrumentation {
+    passesOnly 'javax.jms:jms-api:[1.1-rev-1,)'
+    passesOnly 'jakarta.jms:jakarta.jms-api:[2.0.2,3.0.0-RC1)'
+}
+
 site {
     title 'JMS'
     type 'Messaging'
-    versionOverride '[1.1,)'
-}
+    versionOverride '[1.1,3.0.0)'
+}