Skip to content

Commit 5ea90d6

Browse files
authored
test: upgrade Wildfly to 38 (#492)
Also add deployment descriptor to exclude old Jackson version imported by the container.
1 parent 9fc936f commit 5ea90d6

File tree

3 files changed

+32
-3
lines changed

3 files changed

+32
-3
lines changed

vaadin-cdi-itest/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<surefire.excludedGroups>com.vaadin.cdi.itest.SlowTests</surefire.excludedGroups>
1818
<apache-tomcat.version>11.0.8</apache-tomcat.version>
1919
<apache-tomee.version>10.1.0</apache-tomee.version>
20-
<wildfly.version>36.0.1.Final</wildfly.version>
20+
<wildfly.version>38.0.0.Final</wildfly.version>
2121
<openliberty.version>25.0.0.6</openliberty.version>
2222
<openliberty.template>jakartaee10</openliberty.template>
2323
<openliberty.runtimeArtifactGroupId>io.openliberty</openliberty.runtimeArtifactGroupId>

vaadin-cdi-itest/src/test/java/com/vaadin/cdi/itest/ArchiveProvider.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ private static WebArchive base(String warName) {
6060
private static WebArchive applyContainerConfigurations(WebArchive archive,
6161
PomEquippedResolveStage pom) {
6262
// Testing Tomcat + Weld
63-
if ("tomcat-weld".equals(System.getProperty("arquillian.launch"))) {
63+
String container = System.getProperty("arquillian.launch");
64+
if ("tomcat-weld".equals(container)) {
6465
archive.addAsLibraries(pom
6566
.resolve("org.slf4j:slf4j-simple",
6667
"org.jboss.weld.servlet:weld-servlet-shaded")
@@ -69,14 +70,19 @@ private static WebArchive applyContainerConfigurations(WebArchive archive,
6970
}
7071
// Workaround for https://github.com/payara/Payara/issues/5898
7172
// Slf4J implementation lookup error in Payara 6
72-
else if ("payara".equals(System.getProperty("arquillian.launch"))) {
73+
else if ("payara".equals(container)) {
7374
archive.addAsWebInfResource(AbstractCdiTest.class.getClassLoader()
7475
.getResource("payara/glassfish-web.xml"),
7576
"glassfish-web.xml")
7677
.addAsLibraries(pom.resolve("org.slf4j:slf4j-simple")
7778
.withoutTransitivity().asFile());
7879

80+
} else if ("wildfly".equals(container)) {
81+
archive.addAsWebInfResource(AbstractCdiTest.class.getClassLoader()
82+
.getResource("wildfly/jboss-deployment-structure.xml"),
83+
"jboss-deployment-structure.xml");
7984
}
85+
8086
return archive;
8187
}
8288

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!--
2+
~ Copyright 2000-2025 Vaadin Ltd.
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
~ use this file except in compliance with the License. You may obtain a copy of
6+
~ the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
~ License for the specific language governing permissions and limitations under
14+
~ the License.
15+
-->
16+
17+
<jboss-deployment-structure>
18+
<deployment>
19+
<exclusions>
20+
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
21+
</exclusions>
22+
</deployment>
23+
</jboss-deployment-structure>

0 commit comments

Comments
 (0)