Skip to content

Commit dc60031

Browse files
trasktrask
authored
Update app server patch versions that are tested (#14993)
1 parent 4fab6ab commit dc60031

File tree

6 files changed

+69
-69
lines changed

6 files changed

+69
-69
lines changed

‎docs/supported-libraries.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,20 +204,20 @@ These are the application servers that the smoke tests are run against:
204204

205205
| Application server | Version | JVM | OS |
206206
|---------------------------------------------------------------------------------------|------------------------------------------|--------------------------------------------------------|---------------------------------------|
207-
| [Jetty](https://www.eclipse.org/jetty/) | 9.4.53 | OpenJDK 8, 11, 17, 21, 25<br/>OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
208-
| [Jetty](https://www.eclipse.org/jetty/) | 10.0.19, 11.0.19 | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
209-
| [Jetty](https://www.eclipse.org/jetty/) | 12.0.6 | OpenJDK 17, 21, 25<br/>OpenJ9 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
207+
| [Jetty](https://www.eclipse.org/jetty/) | 9.4.58 | OpenJDK 8, 11, 17, 21, 25<br/>OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
208+
| [Jetty](https://www.eclipse.org/jetty/) | 10.0.26, 11.0.26 | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
209+
| [Jetty](https://www.eclipse.org/jetty/) | 12.0.28 | OpenJDK 17, 21, 25<br/>OpenJ9 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
210210
| [Open Liberty](https://openliberty.io/) | 20.0.0.12 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
211211
| [Open Liberty](https://openliberty.io/) | 21.0.0.12, 22.0.0.12 | OpenJDK 8, 11, 17<br/>OpenJ9 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
212212
| [Open Liberty](https://openliberty.io/) | 23.0.0.12 | OpenJDK 8, 11, 17, 20<br/>OpenJ9 8, 11, 17, 20 | [`ubuntu-latest`], [`windows-latest`] |
213213
| [Payara](https://www.payara.fish/) | 5.2020.6, 5.2021.8 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
214214
| [Payara](https://www.payara.fish/) | 6.2023.12 | OpenJDK 11, 17<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
215215
| [Tomcat](https://tomcat.apache.org/) | 7.0.109 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
216-
| [Tomcat](https://tomcat.apache.org/) | 8.5.98, 9.0.85 | OpenJDK 8, 11, 17, 21, 25<br/>OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
217-
| [Tomcat](https://tomcat.apache.org/) | 10.1.18 | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
216+
| [Tomcat](https://tomcat.apache.org/) | 8.5.98, 9.0.111 | OpenJDK 8, 11, 17, 21, 25<br/>OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
217+
| [Tomcat](https://tomcat.apache.org/) | 10.1.48 | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
218218
| [TomEE](https://tomee.apache.org/) | 7.0.9, 7.1.4 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
219219
| [TomEE](https://tomee.apache.org/) | 8.0.16 | OpenJDK 8, 11, 17, 21, 25<br/>OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
220-
| [TomEE](https://tomee.apache.org/) | 9.1.2 | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
220+
| [TomEE](https://tomee.apache.org/) | 9.1.3 | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
221221
| [Websphere Traditional](https://www.ibm.com/uk-en/cloud/websphere-application-server) | 8.5.5.22, 9.0.5.14 | IBM JDK 8 | Red Hat Enterprise Linux 8.4 |
222222
| [WildFly](https://www.wildfly.org/) | 13.0.0.Final | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
223223
| [WildFly](https://www.wildfly.org/) | 17.0.1.Final, 21.0.0.Final | OpenJDK 8, 11, 17, 21<br/>OpenJ9 8, 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void afterAll() {
6464
static Function<AppServerImage, String> appServerImage(String targetImagePrefix) {
6565
return a -> {
6666
String platformSuffix = a.isWindows() ? "-windows" : "";
67-
String extraTag = "-20251010.18403014526";
67+
String extraTag = "-20251014.18508284308";
6868
String fullSuffix = a.getServerVersion() + "-jdk" + a.getJdk() + platformSuffix + extraTag;
6969
return targetImagePrefix + ":" + fullSuffix;
7070
};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ protected void configure(SmokeTestOptions<AppServerImage> options) {
1414
JettySmokeTest.configureOptions(options).command("java", "-jar", "/server/start.jar", "--jpms");
1515
}
1616

17-
@AppServer(version = "11.0.19", jdk = "11")
17+
@AppServer(version = "11.0.26", jdk = "11")
1818
static class Jetty11JpmsJdk11 extends JettyJpmsSmokeTest {}
1919

20-
@AppServer(version = "11.0.19", jdk = "17")
20+
@AppServer(version = "11.0.26", jdk = "17")
2121
static class Jetty11JpmsJdk17 extends JettyJpmsSmokeTest {}
2222

23-
@AppServer(version = "11.0.19", jdk = "21")
23+
@AppServer(version = "11.0.26", jdk = "21")
2424
static class Jetty11JpmsJdk21 extends JettyJpmsSmokeTest {}
2525

26-
@AppServer(version = "11.0.19", jdk = "25")
26+
@AppServer(version = "11.0.26", jdk = "25")
2727
static class Jetty11JpmsJdk25 extends JettyJpmsSmokeTest {}
2828
}

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,99 +25,99 @@ static SmokeTestOptions<AppServerImage> configureOptions(
2525
.waitStrategy(new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Started Server.*"));
2626
}
2727

28-
@AppServer(version = "9.4.53", jdk = "8")
28+
@AppServer(version = "9.4.58", jdk = "8")
2929
static class Jetty9Jdk8 extends JettySmokeTest {}
3030

31-
@AppServer(version = "9.4.53", jdk = "8-openj9")
31+
@AppServer(version = "9.4.58", jdk = "8-openj9")
3232
static class Jetty9Jdk8Openj9 extends JettySmokeTest {}
3333

34-
@AppServer(version = "9.4.53", jdk = "11")
34+
@AppServer(version = "9.4.58", jdk = "11")
3535
static class Jetty9Jdk11 extends JettySmokeTest {}
3636

37-
@AppServer(version = "9.4.53", jdk = "11-openj9")
37+
@AppServer(version = "9.4.58", jdk = "11-openj9")
3838
static class Jetty9Jdk11Openj9 extends JettySmokeTest {}
3939

40-
@AppServer(version = "9.4.53", jdk = "17")
40+
@AppServer(version = "9.4.58", jdk = "17")
4141
static class Jetty9Jdk17 extends JettySmokeTest {}
4242

43-
@AppServer(version = "9.4.53", jdk = "17-openj9")
43+
@AppServer(version = "9.4.58", jdk = "17-openj9")
4444
static class Jetty9Jdk17Openj9 extends JettySmokeTest {}
4545

46-
@AppServer(version = "9.4.53", jdk = "21")
46+
@AppServer(version = "9.4.58", jdk = "21")
4747
static class Jetty9Jdk21 extends JettySmokeTest {}
4848

49-
@AppServer(version = "9.4.53", jdk = "21-openj9")
49+
@AppServer(version = "9.4.58", jdk = "21-openj9")
5050
static class Jetty9Jdk21Openj9 extends JettySmokeTest {}
5151

52-
@AppServer(version = "9.4.53", jdk = "25")
52+
@AppServer(version = "9.4.58", jdk = "25")
5353
static class Jetty9Jdk25 extends JettySmokeTest {}
5454

55-
@AppServer(version = "9.4.53", jdk = "25-openj9")
55+
@AppServer(version = "9.4.58", jdk = "25-openj9")
5656
static class Jetty9Jdk25Openj9 extends JettySmokeTest {}
5757

58-
@AppServer(version = "10.0.19", jdk = "11")
58+
@AppServer(version = "10.0.26", jdk = "11")
5959
static class Jetty10Jdk11 extends JettySmokeTest {}
6060

61-
@AppServer(version = "10.0.19", jdk = "11-openj9")
61+
@AppServer(version = "10.0.26", jdk = "11-openj9")
6262
static class Jetty10Jdk11Openj9 extends JettySmokeTest {}
6363

64-
@AppServer(version = "10.0.19", jdk = "17")
64+
@AppServer(version = "10.0.26", jdk = "17")
6565
static class Jetty10Jdk17 extends JettySmokeTest {}
6666

67-
@AppServer(version = "10.0.19", jdk = "17-openj9")
67+
@AppServer(version = "10.0.26", jdk = "17-openj9")
6868
static class Jetty10Jdk17Openj9 extends JettySmokeTest {}
6969

70-
@AppServer(version = "10.0.19", jdk = "21")
70+
@AppServer(version = "10.0.26", jdk = "21")
7171
static class Jetty10Jdk21 extends JettySmokeTest {}
7272

73-
@AppServer(version = "10.0.19", jdk = "21-openj9")
73+
@AppServer(version = "10.0.26", jdk = "21-openj9")
7474
static class Jetty10Jdk21Openj9 extends JettySmokeTest {}
7575

76-
@AppServer(version = "10.0.19", jdk = "25")
76+
@AppServer(version = "10.0.26", jdk = "25")
7777
static class Jetty10Jdk25 extends JettySmokeTest {}
7878

79-
@AppServer(version = "10.0.19", jdk = "25-openj9")
79+
@AppServer(version = "10.0.26", jdk = "25-openj9")
8080
static class Jetty10Jdk25Openj9 extends JettySmokeTest {}
8181

82-
@AppServer(version = "11.0.19", jdk = "11")
82+
@AppServer(version = "11.0.26", jdk = "11")
8383
static class Jetty11Jdk11 extends JettySmokeTest {}
8484

85-
@AppServer(version = "11.0.19", jdk = "11-openj9")
85+
@AppServer(version = "11.0.26", jdk = "11-openj9")
8686
static class Jetty11Jdk11Openj9 extends JettySmokeTest {}
8787

88-
@AppServer(version = "11.0.19", jdk = "17")
88+
@AppServer(version = "11.0.26", jdk = "17")
8989
static class Jetty11Jdk17 extends JettySmokeTest {}
9090

91-
@AppServer(version = "11.0.19", jdk = "17-openj9")
91+
@AppServer(version = "11.0.26", jdk = "17-openj9")
9292
static class Jetty11Jdk17Openj9 extends JettySmokeTest {}
9393

94-
@AppServer(version = "11.0.19", jdk = "21")
94+
@AppServer(version = "11.0.26", jdk = "21")
9595
static class Jetty11Jdk21 extends JettySmokeTest {}
9696

97-
@AppServer(version = "11.0.19", jdk = "21-openj9")
97+
@AppServer(version = "11.0.26", jdk = "21-openj9")
9898
static class Jetty11Jdk21Openj9 extends JettySmokeTest {}
9999

100-
@AppServer(version = "11.0.19", jdk = "25")
100+
@AppServer(version = "11.0.26", jdk = "25")
101101
static class Jetty11Jdk25 extends JettySmokeTest {}
102102

103-
@AppServer(version = "11.0.19", jdk = "25-openj9")
103+
@AppServer(version = "11.0.26", jdk = "25-openj9")
104104
static class Jetty11Jdk25Openj9 extends JettySmokeTest {}
105105

106-
@AppServer(version = "12.0.6", jdk = "17")
106+
@AppServer(version = "12.0.28", jdk = "17")
107107
static class Jetty12Jdk17 extends JettySmokeTest {}
108108

109-
@AppServer(version = "12.0.6", jdk = "17-openj9")
109+
@AppServer(version = "12.0.28", jdk = "17-openj9")
110110
static class Jetty12Jdk17Openj9 extends JettySmokeTest {}
111111

112-
@AppServer(version = "12.0.6", jdk = "21")
112+
@AppServer(version = "12.0.28", jdk = "21")
113113
static class Jetty12Jdk21 extends JettySmokeTest {}
114114

115-
@AppServer(version = "12.0.6", jdk = "21-openj9")
115+
@AppServer(version = "12.0.28", jdk = "21-openj9")
116116
static class Jetty12Jdk21Openj9 extends JettySmokeTest {}
117117

118-
@AppServer(version = "12.0.6", jdk = "25")
118+
@AppServer(version = "12.0.28", jdk = "25")
119119
static class Jetty12Jdk25 extends JettySmokeTest {}
120120

121-
@AppServer(version = "12.0.6", jdk = "25-openj9")
121+
@AppServer(version = "12.0.28", jdk = "25-openj9")
122122
static class Jetty12Jdk25Openj9 extends JettySmokeTest {}
123123
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,57 +61,57 @@ static class Tomcat8Jdk25 extends TomcatSmokeTest {}
6161
@AppServer(version = "8.5.98", jdk = "25-openj9")
6262
static class Tomcat8Jdk25Openj9 extends TomcatSmokeTest {}
6363

64-
@AppServer(version = "9.0.85", jdk = "8")
64+
@AppServer(version = "9.0.111", jdk = "8")
6565
static class Tomcat9Jdk8 extends TomcatSmokeTest {}
6666

67-
@AppServer(version = "9.0.85", jdk = "8-openj9")
67+
@AppServer(version = "9.0.111", jdk = "8-openj9")
6868
static class Tomcat9Jdk8Openj9 extends TomcatSmokeTest {}
6969

70-
@AppServer(version = "9.0.85", jdk = "11")
70+
@AppServer(version = "9.0.111", jdk = "11")
7171
static class Tomcat9Jdk11 extends TomcatSmokeTest {}
7272

73-
@AppServer(version = "9.0.85", jdk = "11-openj9")
73+
@AppServer(version = "9.0.111", jdk = "11-openj9")
7474
static class Tomcat9Jdk11Openj9 extends TomcatSmokeTest {}
7575

76-
@AppServer(version = "9.0.85", jdk = "17")
76+
@AppServer(version = "9.0.111", jdk = "17")
7777
static class Tomcat9Jdk17 extends TomcatSmokeTest {}
7878

79-
@AppServer(version = "9.0.85", jdk = "17-openj9")
79+
@AppServer(version = "9.0.111", jdk = "17-openj9")
8080
static class Tomcat9Jdk17Openj9 extends TomcatSmokeTest {}
8181

82-
@AppServer(version = "9.0.85", jdk = "21")
82+
@AppServer(version = "9.0.111", jdk = "21")
8383
static class Tomcat9Jdk21 extends TomcatSmokeTest {}
8484

85-
@AppServer(version = "9.0.85", jdk = "21-openj9")
85+
@AppServer(version = "9.0.111", jdk = "21-openj9")
8686
static class Tomcat9Jdk21Openj9 extends TomcatSmokeTest {}
8787

88-
@AppServer(version = "9.0.85", jdk = "25")
88+
@AppServer(version = "9.0.111", jdk = "25")
8989
static class Tomcat9Jdk25 extends TomcatSmokeTest {}
9090

91-
@AppServer(version = "9.0.85", jdk = "25-openj9")
91+
@AppServer(version = "9.0.111", jdk = "25-openj9")
9292
static class Tomcat9Jdk25Openj9 extends TomcatSmokeTest {}
9393

94-
@AppServer(version = "10.1.18", jdk = "11")
94+
@AppServer(version = "10.1.48", jdk = "11")
9595
static class Tomcat10Jdk11 extends TomcatSmokeTest {}
9696

97-
@AppServer(version = "10.1.18", jdk = "11-openj9")
97+
@AppServer(version = "10.1.48", jdk = "11-openj9")
9898
static class Tomcat10Jdk11Openj9 extends TomcatSmokeTest {}
9999

100-
@AppServer(version = "10.1.18", jdk = "17")
100+
@AppServer(version = "10.1.48", jdk = "17")
101101
static class Tomcat10Jdk17 extends TomcatSmokeTest {}
102102

103-
@AppServer(version = "10.1.18", jdk = "17-openj9")
103+
@AppServer(version = "10.1.48", jdk = "17-openj9")
104104
static class Tomcat10Jdk17Openj9 extends TomcatSmokeTest {}
105105

106-
@AppServer(version = "10.1.18", jdk = "21")
106+
@AppServer(version = "10.1.48", jdk = "21")
107107
static class Tomcat10Jdk21 extends TomcatSmokeTest {}
108108

109-
@AppServer(version = "10.1.18", jdk = "21-openj9")
109+
@AppServer(version = "10.1.48", jdk = "21-openj9")
110110
static class Tomcat10Jdk21Openj9 extends TomcatSmokeTest {}
111111

112-
@AppServer(version = "10.1.18", jdk = "25")
112+
@AppServer(version = "10.1.48", jdk = "25")
113113
static class Tomcat10Jdk25 extends TomcatSmokeTest {}
114114

115-
@AppServer(version = "10.1.18", jdk = "25-openj9")
115+
@AppServer(version = "10.1.48", jdk = "25-openj9")
116116
static class Tomcat10Jdk25Openj9 extends TomcatSmokeTest {}
117117
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,27 +70,27 @@ static class Tomee8Jdk25 extends TomeeSmokeTest {}
7070
@AppServer(version = "8.0.16", jdk = "25-openj9")
7171
static class Tomee8Jdk25Openj9 extends TomeeSmokeTest {}
7272

73-
@AppServer(version = "9.1.2", jdk = "11")
73+
@AppServer(version = "9.1.3", jdk = "11")
7474
static class Tomee9Jdk11 extends TomeeSmokeTest {}
7575

76-
@AppServer(version = "9.1.2", jdk = "11-openj9")
76+
@AppServer(version = "9.1.3", jdk = "11-openj9")
7777
static class Tomee9Jdk11Openj9 extends TomeeSmokeTest {}
7878

79-
@AppServer(version = "9.1.2", jdk = "17")
79+
@AppServer(version = "9.1.3", jdk = "17")
8080
static class Tomee9Jdk17 extends TomeeSmokeTest {}
8181

82-
@AppServer(version = "9.1.2", jdk = "17-openj9")
82+
@AppServer(version = "9.1.3", jdk = "17-openj9")
8383
static class Tomee9Jdk17Openj9 extends TomeeSmokeTest {}
8484

85-
@AppServer(version = "9.1.2", jdk = "21")
85+
@AppServer(version = "9.1.3", jdk = "21")
8686
static class Tomee9Jdk21 extends TomeeSmokeTest {}
8787

88-
@AppServer(version = "9.1.2", jdk = "21-openj9")
88+
@AppServer(version = "9.1.3", jdk = "21-openj9")
8989
static class Tomee9Jdk21Openj9 extends TomeeSmokeTest {}
9090

91-
@AppServer(version = "9.1.2", jdk = "25")
91+
@AppServer(version = "9.1.3", jdk = "25")
9292
static class Tomee9Jdk25 extends TomeeSmokeTest {}
9393

94-
@AppServer(version = "9.1.2", jdk = "25-openj9")
94+
@AppServer(version = "9.1.3", jdk = "25-openj9")
9595
static class Tomee9Jdk25Openj9 extends TomeeSmokeTest {}
9696
}

0 commit comments

Comments
 (0)