Skip to content

Commit f7ff143

Browse files
authored
Reactor core: test latest versions (#7595)
1 parent ff190af commit f7ff143

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

dd-java-agent/instrumentation/reactor-core-3.1/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
testImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
2222
testImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1.28.0'
2323

24-
latestDepTestImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.4.+'
24+
latestDepTestImplementation group: 'io.projectreactor', name: 'reactor-core', version: '+'
2525
// Looks like later versions on reactor need this dependency for some reason even though it is marked as optional.
2626
latestDepTestImplementation group: 'io.micrometer', name: 'micrometer-core', version: '1.+'
2727
}

dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe
4747
commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4848
de.thetaphi:forbiddenapis:3.1=compileClasspath
4949
info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath
50-
io.micrometer:micrometer-commons:1.13.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
51-
io.micrometer:micrometer-core:1.13.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
52-
io.micrometer:micrometer-observation:1.13.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
50+
io.micrometer:micrometer-commons:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
51+
io.micrometer:micrometer-core:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
52+
io.micrometer:micrometer-observation:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
5353
io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
5454
io.opentelemetry:opentelemetry-api:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
5555
io.opentelemetry:opentelemetry-context:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
5656
io.projectreactor:reactor-core:3.1.0.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath
57-
io.projectreactor:reactor-core:3.4.41=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
57+
io.projectreactor:reactor-core:3.6.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
5858
io.sqreen:libsqreen:11.0.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
5959
javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
6060
jaxen:jaxen:1.2.0=spotbugs
@@ -81,7 +81,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
8181
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
8282
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
8383
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
84-
org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath
84+
org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8585
org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor
8686
org.codehaus.groovy:groovy-all:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8787
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
@@ -126,14 +126,16 @@ org.hdrhistogram:HdrHistogram:2.2.2=latestDepTestRuntimeClasspath
126126
org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
127127
org.junit.jupiter:junit-jupiter-api:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
128128
org.junit.jupiter:junit-jupiter-engine:5.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
129-
org.junit.platform:junit-platform-commons:1.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
130-
org.junit.platform:junit-platform-engine:1.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
129+
org.junit.platform:junit-platform-commons:1.9.0=latestDepTestCompileClasspath,testCompileClasspath
130+
org.junit.platform:junit-platform-commons:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
131+
org.junit.platform:junit-platform-engine:1.9.0=latestDepTestCompileClasspath,testCompileClasspath
132+
org.junit.platform:junit-platform-engine:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
131133
org.junit.platform:junit-platform-launcher:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
132-
org.junit.platform:junit-platform-runner:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
133-
org.junit.platform:junit-platform-suite-api:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
134-
org.junit.platform:junit-platform-suite-commons:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
134+
org.junit.platform:junit-platform-runner:1.9.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
135+
org.junit.platform:junit-platform-suite-api:1.9.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
136+
org.junit.platform:junit-platform-suite-commons:1.9.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
137+
org.junit:junit-bom:5.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
135138
org.junit:junit-bom:5.9.1=spotbugs
136-
org.junit:junit-bom:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
137139
org.latencyutils:LatencyUtils:2.0.3=latestDepTestRuntimeClasspath
138140
org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
139141
org.opentest4j:opentest4j:1.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ class ReactorCoreTest extends AgentTestRunner {
373373
where:
374374
schedulerName | scheduler
375375
"parallel" | Schedulers.parallel()
376-
"elastic" | Schedulers.elastic()
376+
"elastic" | (isLatestDepTest ? Schedulers."boundedElastic"() : Schedulers."elastic"())
377377
"single" | Schedulers.single()
378378
"immediate" | Schedulers.immediate()
379379
}

0 commit comments

Comments
 (0)