From 4ab8a3259a175cb1490a16df232908ddc8ba567b Mon Sep 17 00:00:00 2001 From: tbradellis Date: Thu, 7 Jul 2022 16:12:28 -0700 Subject: [PATCH 1/2] revert jetty version change --- instrumentation/jersey-2/build.gradle | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/instrumentation/jersey-2/build.gradle b/instrumentation/jersey-2/build.gradle index 13c8aa5043..613d17409f 100644 --- a/instrumentation/jersey-2/build.gradle +++ b/instrumentation/jersey-2/build.gradle @@ -1,22 +1,25 @@ dependencies { implementation(project(":agent-bridge")) implementation(project(":newrelic-api")) - implementation("org.glassfish.jersey.core:jersey-server:2.0-m13-3") + implementation("org.glassfish.jersey.core:jersey-server:2.28") testImplementation("com.jayway.restassured:rest-assured:2.7.0") testImplementation("org.eclipse.jetty:jetty-server:9.4.6.v20170531") testImplementation("org.eclipse.jetty:jetty-servlet:9.4.6.v20170531") - testImplementation("org.glassfish.jersey.core:jersey-server:2.25.1") - testImplementation("org.glassfish.jersey.containers:jersey-container-servlet-core:2.25.1") - testImplementation("org.glassfish.jersey.containers:jersey-container-jetty-http:2.25.1") - testImplementation("org.glassfish.jersey.containers:jersey-container-servlet:2.25.1") - testImplementation("javax.xml.bind:jaxb-api:2.3.0") + + testImplementation("org.glassfish.jersey.core:jersey-server:2.28") + testImplementation("org.glassfish.jersey.containers:jersey-container-servlet-core:2.28") + testImplementation("org.glassfish.jersey.containers:jersey-container-jetty-http:2.28") + testImplementation("org.glassfish.jersey.containers:jersey-container-servlet:2.28") + testImplementation("jakarta.xml.bind:jakarta.xml.bind-api:2.3.3") } jar { manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.jersey-2' } } +// org.glassfish.jersey.core 2.28 version starts pulling in jakarata jar named dependencies. +// Version 3.0.0-M1 starts pulling in jakarata with renamed jar and packages verifyInstrumentation { passesOnly 'org.glassfish.jersey.core:jersey-server:[2.0,3.0.0-M1)' exclude 'org.glassfish.jersey.core:jersey-server:[2.0-m05-2,2.0)' From ea95a7c1bc0c2ddd66007d05ce4417fddeeed9b7 Mon Sep 17 00:00:00 2001 From: tbradellis Date: Mon, 11 Jul 2022 16:05:57 -0700 Subject: [PATCH 2/2] fix spacing --- instrumentation/jersey-2/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instrumentation/jersey-2/build.gradle b/instrumentation/jersey-2/build.gradle index 613d17409f..d3129e6667 100644 --- a/instrumentation/jersey-2/build.gradle +++ b/instrumentation/jersey-2/build.gradle @@ -1,17 +1,17 @@ dependencies { implementation(project(":agent-bridge")) - implementation(project(":newrelic-api")) - + implementation(project(":newrelic-api"))\ implementation("org.glassfish.jersey.core:jersey-server:2.28") + testImplementation("com.jayway.restassured:rest-assured:2.7.0") testImplementation("org.eclipse.jetty:jetty-server:9.4.6.v20170531") testImplementation("org.eclipse.jetty:jetty-servlet:9.4.6.v20170531") - testImplementation("org.glassfish.jersey.core:jersey-server:2.28") testImplementation("org.glassfish.jersey.containers:jersey-container-servlet-core:2.28") testImplementation("org.glassfish.jersey.containers:jersey-container-jetty-http:2.28") testImplementation("org.glassfish.jersey.containers:jersey-container-servlet:2.28") testImplementation("jakarta.xml.bind:jakarta.xml.bind-api:2.3.3") + } jar {