Skip to content

Commit

Permalink
Remove restriction to not run vertx4 latest tests on java 17 (#8133)
Browse files Browse the repository at this point in the history
* does this pass ?

* Revert "does this pass ?"

This reverts commit 57dc994.

* use java 17 only for latest dep tests
  • Loading branch information
vandonr authored Jan 6, 2025
1 parent 6ef294d commit 4e79504
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions dd-java-agent/instrumentation/vertx-web-4.0/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Set properties before any plugins get loaded
ext {
// TODO Java 17: This version of vertx-web doesn't support Java 17
// vertx-web doesn't support Java 17 until v4.2
maxJavaVersionForTests = JavaVersion.VERSION_15
latestDepTestMaxJavaVersionForTests = JavaVersion.VERSION_17
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down Expand Up @@ -29,7 +30,7 @@ artifacts {
dependencies {
api project(':dd-java-agent:instrumentation:netty-4.1-shared')

compileOnly group: 'io.vertx', name: 'vertx-web', version: '4.2.7'
compileOnly group: 'io.vertx', name: 'vertx-web', version: '4.0.0'

testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
Expand All @@ -44,6 +45,7 @@ dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
testRuntimeOnly project(':dd-java-agent:instrumentation:netty-buffer-4')

// TODO support v>=4.5
latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '4.4.+'
latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '4.4.+'
}

0 comments on commit 4e79504

Please sign in to comment.