1
1
ext {
2
2
minVersionForTests = JavaVersion . VERSION_11
3
+ latestDepTestMinVersionForTests = JavaVersion . VERSION_17
3
4
}
4
5
muzzle {
5
6
pass {
@@ -22,15 +23,29 @@ apply from: "${rootDir}/gradle/java.gradle"
22
23
addTestSuite(' latestDepTest' )
23
24
addTestSuiteForDir(' cxf3LatestDepTest' , ' test' )
24
25
25
- [compileLatestDepTestJava, compileCxf3LatestDepTestJava]. each {
26
+ [compileCxf3LatestDepTestJava]. each {
26
27
it. configure {
27
28
setJavaVersion(it, 11 )
28
29
sourceCompatibility = JavaVersion . VERSION_1_8
29
30
targetCompatibility = JavaVersion . VERSION_1_8
30
31
}
31
32
}
32
33
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 {
34
49
it. configure {
35
50
javaLauncher = getJavaLauncherFor(11 )
36
51
}
@@ -50,6 +65,7 @@ dependencies {
50
65
testRuntimeOnly project(' :dd-java-agent:instrumentation:jetty-7.6' )
51
66
testRuntimeOnly project(' :dd-java-agent:instrumentation:jetty-9' )
52
67
testRuntimeOnly project(' :dd-java-agent:instrumentation:jetty-11' )
68
+ testRuntimeOnly project(' :dd-java-agent:instrumentation:jetty-12' )
53
69
testRuntimeOnly project(' :dd-java-agent:instrumentation:trace-annotation' )
54
70
testRuntimeOnly project(' :dd-java-agent:instrumentation:jax-rs-annotations-2' )
55
71
testRuntimeOnly project(' :dd-java-agent:instrumentation:jakarta-rs-annotations-3' )
0 commit comments