Skip to content

Commit 4dc68bb

Browse files
committed
baseline latest cxf to java 17
1 parent e679b57 commit 4dc68bb

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

dd-java-agent/instrumentation/cxf-2.1/build.gradle

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ext {
22
minVersionForTests = JavaVersion.VERSION_11
3+
latestDepTestMinVersionForTests = JavaVersion.VERSION_17
34
}
45
muzzle {
56
pass {
@@ -22,15 +23,29 @@ apply from: "${rootDir}/gradle/java.gradle"
2223
addTestSuite('latestDepTest')
2324
addTestSuiteForDir('cxf3LatestDepTest', 'test')
2425

25-
[compileLatestDepTestJava, compileCxf3LatestDepTestJava].each {
26+
[compileCxf3LatestDepTestJava].each {
2627
it.configure {
2728
setJavaVersion(it, 11)
2829
sourceCompatibility = JavaVersion.VERSION_1_8
2930
targetCompatibility = JavaVersion.VERSION_1_8
3031
}
3132
}
3233

33-
[compileLatestDepTestGroovy, latestDepTest, compileCxf3LatestDepTestGroovy, cxf3LatestDepTest].each {
34+
[compileLatestDepTestJava].each {
35+
it.configure {
36+
setJavaVersion(it, 17)
37+
sourceCompatibility = JavaVersion.VERSION_1_8
38+
targetCompatibility = JavaVersion.VERSION_1_8
39+
}
40+
}
41+
42+
[compileLatestDepTestGroovy, latestDepTest].each {
43+
it.configure {
44+
javaLauncher = getJavaLauncherFor(17)
45+
}
46+
}
47+
48+
[compileCxf3LatestDepTestGroovy, cxf3LatestDepTest].each {
3449
it.configure {
3550
javaLauncher = getJavaLauncherFor(11)
3651
}
@@ -50,6 +65,7 @@ dependencies {
5065
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-7.6')
5166
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
5267
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11')
68+
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-12')
5369
testRuntimeOnly project(':dd-java-agent:instrumentation:trace-annotation')
5470
testRuntimeOnly project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
5571
testRuntimeOnly project(':dd-java-agent:instrumentation:jakarta-rs-annotations-3')

0 commit comments

Comments
 (0)