Skip to content

Commit c280906

Browse files
committed
Remove Java 25 support from Wildfly 28/29/30
Wildfly versions 28.0.1.Final, 29.0.1.Final, and 30.0.1.Final do not support Java 25. Containers start but fail with 'execInContainer can only be used while the Container is running' errors before tests can execute.
1 parent dfeca7a commit c280906

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

smoke-tests/images/servlet/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ val targets = mapOf(
4242
ImageTarget(listOf("5.2020.6", "5.2021.8"), listOf("hotspot", "openj9"), listOf("8", "11")),
4343
// Test application is not deployed when server is sarted with hotspot jdk version 21
4444
ImageTarget(listOf("6.2023.12"), listOf("hotspot"), listOf("11", "17"), war = "servlet-5.0"),
45-
// Payara 6.2023.12 does not support Java 25 (OSGi bundle resolution failures)
4645
ImageTarget(listOf("6.2023.12"), listOf("openj9"), listOf("11", "17", "21"), war = "servlet-5.0")
4746
),
4847
"tomcat" to listOf(
@@ -64,12 +63,12 @@ val targets = mapOf(
6463
ImageTarget(
6564
listOf("17.0.1.Final", "21.0.0.Final"),
6665
listOf("hotspot", "openj9"),
67-
listOf("8", "11", "17", "21", latestJava)
66+
listOf("8", "11", "17", "21")
6867
),
6968
ImageTarget(
7069
listOf("28.0.1.Final", "29.0.1.Final", "30.0.1.Final"),
7170
listOf("hotspot", "openj9"),
72-
listOf("11", "17", "21", latestJava),
71+
listOf("11", "17", "21"),
7372
war = "servlet-5.0"
7473
),
7574
),

smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/WildflySmokeTest.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,6 @@ static class Wildfly28Jdk21 extends WildflySmokeTest {}
9292
@AppServer(version = "28.0.1.Final", jdk = "21-openj9")
9393
static class Wildfly28Jdk21Openj9 extends WildflySmokeTest {}
9494

95-
@AppServer(version = "28.0.1.Final", jdk = "25")
96-
static class Wildfly28Jdk25 extends WildflySmokeTest {}
97-
98-
@AppServer(version = "28.0.1.Final", jdk = "25-openj9")
99-
static class Wildfly28Jdk25Openj9 extends WildflySmokeTest {}
100-
10195
@AppServer(version = "29.0.1.Final", jdk = "11")
10296
static class Wildfly29Jdk11 extends WildflySmokeTest {}
10397

@@ -116,12 +110,6 @@ static class Wildfly29Jdk21 extends WildflySmokeTest {}
116110
@AppServer(version = "29.0.1.Final", jdk = "21-openj9")
117111
static class Wildfly29Jdk21Openj9 extends WildflySmokeTest {}
118112

119-
@AppServer(version = "29.0.1.Final", jdk = "25")
120-
static class Wildfly29Jdk25 extends WildflySmokeTest {}
121-
122-
@AppServer(version = "29.0.1.Final", jdk = "25-openj9")
123-
static class Wildfly29Jdk25Openj9 extends WildflySmokeTest {}
124-
125113
@AppServer(version = "30.0.1.Final", jdk = "11")
126114
static class Wildfly30Jdk11 extends WildflySmokeTest {}
127115

@@ -139,10 +127,4 @@ static class Wildfly30Jdk21 extends WildflySmokeTest {}
139127

140128
@AppServer(version = "30.0.1.Final", jdk = "21-openj9")
141129
static class Wildfly30Jdk21Openj9 extends WildflySmokeTest {}
142-
143-
@AppServer(version = "30.0.1.Final", jdk = "25")
144-
static class Wildfly30Jdk25 extends WildflySmokeTest {}
145-
146-
@AppServer(version = "30.0.1.Final", jdk = "25-openj9")
147-
static class Wildfly30Jdk25Openj9 extends WildflySmokeTest {}
148130
}

0 commit comments

Comments
 (0)