Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove restriction to not run vertx4 latest tests on java 17 #8133

Merged
merged 3 commits into from
Jan 6, 2025
Merged

Remove restriction to not run vertx4 latest tests on java 17 #8133

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57dc994
does this pass ?
vandonr Dec 30, 2024
49701ef
Revert "does this pass ?"
vandonr Dec 31, 2024
d3eef23
use java 17 only for latest dep tests
vandonr Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions dd-java-agent/instrumentation/vertx-web-4.0/build.gradle
View file
Open in desktop
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
vandonr marked this conversation as resolved.
Show resolved Hide resolved
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.+'
}
Loading