Skip to content

Commit 923ac63

Browse files
authored
Ignore jboss and quarkus smoke tests for JDK 24+ (#9147)
* Update jboss * Update quarkus
1 parent 6aecdea commit 923ac63

File tree

5 files changed

+8
-16
lines changed

5 files changed

+8
-16
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package datadog.smoketest
22

3+
import datadog.environment.JavaVirtualMachine
34
import spock.lang.IgnoreIf
45

5-
@IgnoreIf({
6-
// JBoss Modules 1.x doesn't support Java 17
7-
new BigDecimal(System.getProperty("java.specification.version")).isAtLeast(17.0)
6+
@IgnoreIf(reason = "JBoss Modules 1.x doesn't support Java 17", value = {
7+
JavaVirtualMachine.isJavaVersionAtLeast(17)
88
})
99
class JBossModulesV1SmokeTest extends AbstractModulesSmokeTest {}

dd-smoke-tests/jboss-modules/src/test/groovy/datadog/smoketest/JBossModulesV2SmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package datadog.smoketest
33
import datadog.environment.JavaVirtualMachine
44
import spock.lang.IgnoreIf
55

6-
@IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = {
6+
@IgnoreIf(reason = "JBoss Modules does not support Java 24+", value = {
77
JavaVirtualMachine.isJavaVersionAtLeast(24)
88
})
99
class JBossModulesV2SmokeTest extends AbstractModulesSmokeTest {}

dd-smoke-tests/quarkus/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
ext {
2+
// Quarkus is only supported up to Java 21: https://github.com/quarkusio/quarkus
3+
maxJavaVersionForTests = JavaVersion.VERSION_21
4+
}
15

26
apply from: "$rootDir/gradle/java.gradle"
37

dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusJBossLoggingSmokeTest.groovy

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package datadog.smoketest
22

3-
import datadog.environment.JavaVirtualMachine
4-
import spock.lang.IgnoreIf
5-
6-
@IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = {
7-
JavaVirtualMachine.isJavaVersionAtLeast(24)
8-
})
93
class QuarkusJBossLoggingSmokeTest extends QuarkusSmokeTest {
104
@Override
115
String helloEndpointName() {

dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusSlf4jSmokeTest.groovy

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package datadog.smoketest
22

3-
import datadog.environment.JavaVirtualMachine
4-
import spock.lang.IgnoreIf
5-
6-
@IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = {
7-
JavaVirtualMachine.isJavaVersionAtLeast(24)
8-
})
93
class QuarkusSlf4jSmokeTest extends QuarkusSmokeTest {
104
@Override
115
String helloEndpointName() {

0 commit comments

Comments
 (0)