Skip to content

Commit 7d4110a

Browse files
AlexeyKuznetsov-DDAlexeyKuznetsov-DD
committed
Limited latest jersey to 4.+ as latest jersey-common:5.0.0-M1 required Java 21+
1 parent 920231e commit 7d4110a

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

‎dd-java-agent/instrumentation/jersey/jersey-2.0/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ dependencies {
4444
testImplementation group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.0.0'
4545
testImplementation group: 'org.glassfish.jersey.core', name: 'jersey-common', version: jersey3Version
4646

47-
latestDepTestImplementation group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '+'
48-
latestDepTestImplementation group: 'org.glassfish.jersey.core', name: 'jersey-common', version:'+'
47+
latestDepTestImplementation group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '4.+'
48+
latestDepTestImplementation group: 'org.glassfish.jersey.core', name: 'jersey-common', version:'4.+'
4949

5050
jersey2JettyTestImplementation project(':dd-java-agent:instrumentation-testing'), {
5151
exclude group: 'org.eclipse.jetty', module: 'jetty-server'

‎dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ de.thetaphi:forbiddenapis:3.10=compileClasspath
6161
io.leangen.geantyref:geantyref:1.3.16=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
6262
io.sqreen:libsqreen:17.3.0=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
6363
jakarta.activation:jakarta.activation-api:2.1.0=jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath
64-
jakarta.annotation:jakarta.annotation-api:2.1.1=jersey2JettyTestCompileClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
65-
jakarta.annotation:jakarta.annotation-api:3.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
64+
jakarta.annotation:jakarta.annotation-api:2.1.1=jersey2JettyTestCompileClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath
65+
jakarta.annotation:jakarta.annotation-api:3.0.0=latestDepTestRuntimeClasspath
6666
jakarta.inject:jakarta.inject-api:2.0.1=jersey2JettyTestCompileClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
6767
jakarta.servlet:jakarta.servlet-api:6.0.0=jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath
6868
jakarta.validation:jakarta.validation-api:3.0.2=jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath
6969
jakarta.ws.rs:jakarta.ws.rs-api:3.0.0=jersey2JettyTestRuntimeClasspath
70-
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jersey2JettyTestCompileClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
71-
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
70+
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jersey2JettyTestCompileClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath
71+
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=latestDepTestRuntimeClasspath
7272
jakarta.xml.bind:jakarta.xml.bind-api:4.0.0=jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath
7373
javax.activation:activation:1.1=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath
7474
javax.activation:javax.activation-api:1.2.0=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath
@@ -132,8 +132,8 @@ org.glassfish.hk2:hk2-utils:2.1.88=compileClasspath
132132
org.glassfish.hk2:hk2-utils:2.4.0-b12=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath
133133
org.glassfish.hk2:hk2-utils:3.0.4=jersey3JettyTestRuntimeClasspath
134134
org.glassfish.hk2:osgi-resource-locator:1.0.1=compileClasspath,jersey2JettyTestRuntimeClasspath
135-
org.glassfish.hk2:osgi-resource-locator:1.0.3=jersey2JettyTestCompileClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
136-
org.glassfish.hk2:osgi-resource-locator:3.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
135+
org.glassfish.hk2:osgi-resource-locator:1.0.3=jersey2JettyTestCompileClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath
136+
org.glassfish.hk2:osgi-resource-locator:3.0.0=latestDepTestRuntimeClasspath
137137
org.glassfish.jersey.bundles.repackaged:jersey-guava:2.18=jersey2JettyTestRuntimeClasspath
138138
org.glassfish.jersey.containers:jersey-container-jetty-http:2.18=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath
139139
org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.2=jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath
@@ -142,8 +142,9 @@ org.glassfish.jersey.core:jersey-client:2.18=jersey2JettyTestCompileClasspath,je
142142
org.glassfish.jersey.core:jersey-client:3.1.2=jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath
143143
org.glassfish.jersey.core:jersey-common:2.0=compileClasspath
144144
org.glassfish.jersey.core:jersey-common:2.18=jersey2JettyTestRuntimeClasspath
145+
org.glassfish.jersey.core:jersey-common:3.1.11=latestDepTestCompileClasspath
145146
org.glassfish.jersey.core:jersey-common:3.1.2=jersey2JettyTestCompileClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
146-
org.glassfish.jersey.core:jersey-common:5.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
147+
org.glassfish.jersey.core:jersey-common:4.0.2=latestDepTestRuntimeClasspath
147148
org.glassfish.jersey.core:jersey-server:2.0=compileClasspath
148149
org.glassfish.jersey.core:jersey-server:2.18=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath
149150
org.glassfish.jersey.core:jersey-server:3.1.2=jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath
@@ -203,5 +204,7 @@ org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
203204
org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
204205
org.spockframework:spock-bom:2.4-groovy-3.0=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
205206
org.spockframework:spock-core:2.4-groovy-3.0=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
207+
org.tabletest:tabletest-junit:1.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
208+
org.tabletest:tabletest-parser:1.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
206209
org.xmlresolver:xmlresolver:5.3.3=spotbugs
207210
empty=spotbugsPlugins

0 commit comments

Comments
 (0)