Skip to content

Commit 2eeb9f8

Browse files
committed
Add profile for compiling with JakartaEE11 and testing with WildFly preview
1 parent 83f614e commit 2eeb9f8

File tree

5 files changed

+70
-3
lines changed

5 files changed

+70
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
- 25
2727
container:
2828
- wildfly-managed
29+
# Build warp with the JakartaEE11 api and run it using the wildfly-preview server:
30+
- jakartaee11,wildfly-jakartaee11-managed
2931
- glassfish-managed
3032
- tomee-managed
3133
steps:

build/ftest-base/pom.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,41 @@
177177
</dependency>
178178
</dependencies>
179179
</profile>
180+
<profile>
181+
<id>wildfly-jakartaee11-managed</id>
182+
<!-- A WildFly preview container which supports JakartaEE11.
183+
Run this profile only in combination with the profile "jakartaee11" so that arquillian-extension-warp is built using the JakartaEE11 api:
184+
mvn clean install -Pjakartaee11,wildfly-jakartaee11-managed
185+
-->
186+
<activation>
187+
<property>
188+
<name>integration</name>
189+
<value>wildfly</value>
190+
</property>
191+
</activation>
192+
<properties>
193+
<arquillian.launch.wildfly>true</arquillian.launch.wildfly>
194+
<arquillian.container.home>${project.build.directory}/wildfly-preview-${version.wildfly}</arquillian.container.home>
195+
<arquillian.container.distribution>org.wildfly:wildfly-preview-dist:zip:${version.wildfly}
196+
</arquillian.container.distribution>
197+
</properties>
198+
<dependencies>
199+
<dependency>
200+
<groupId>org.wildfly.arquillian</groupId>
201+
<artifactId>wildfly-arquillian-container-managed</artifactId>
202+
<version>${version.wildfly.arquillian.container}</version>
203+
<scope>test</scope>
204+
</dependency>
205+
<!--The dependency on the servlet api must be declared for each profile, see detailed explanation in the
206+
test "org.jboss.arquillian.warp.jsf.ftest.lifecycle.TestFacesLifecycleFailurePropagation" in "jsf-ftest" project.
207+
-->
208+
<dependency>
209+
<groupId>jakarta.servlet</groupId>
210+
<artifactId>jakarta.servlet-api</artifactId>
211+
<scope>provided</scope>
212+
</dependency>
213+
</dependencies>
214+
</profile>
180215
<profile>
181216
<id>tomee-managed</id>
182217
<activation>

build/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,8 @@
282282
<version>${version.jacoco}</version>
283283
<configuration>
284284
<excludes>
285-
<!-- Avoid error messages "org.jacoco.agent.rt.internal_1f1cc91.asm.MethodTooLargeException: Method too large" in classes in packages listed here: -->
286-
<exclude>com/gargoylesoftware/htmlunit/css/**</exclude>
287-
<exclude>com/gargoylesoftware/css/parser/javacc/**</exclude>
288285
<exclude>org/htmlunit/cssparser/parser/javacc/CSS3ParserTokenManager</exclude>
286+
<exclude>org/htmlunit/css/StyleAttributes$Definition</exclude>
289287
</excludes>
290288
</configuration>
291289
<executions>

extension/jsf-ftest/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,16 @@
6868
<type>pom</type>
6969
<scope>test</scope>
7070
</dependency>
71+
<!--Force newer HtmlUnit version (JakartaEE11 error: "TypeError: redeclaration of const url" is fixed in newer versions.
72+
It is broken in 4.19.1, works with 4.23.0 and newer.
73+
See https://github.com/arquillian/arquillian-extension-warp/issues/251-->
74+
<dependency>
75+
<groupId>org.seleniumhq.selenium</groupId>
76+
<artifactId>htmlunit3-driver</artifactId>
77+
<version>4.36.0</version>
78+
<type>pom</type>
79+
<scope>test</scope>
80+
</dependency>
7181

7282
<dependency>
7383
<groupId>org.junit.jupiter</groupId>

pom.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,26 @@
140140
<module>aggregate-jacoco-report</module>
141141
</modules>
142142

143+
<profiles>
144+
<profile>
145+
<!-- This profile is used to build arquillian-extension-warp by using the JakartaEE11 api:
146+
it redefines the versions of the JakartaEE dependencies.
147+
Use it only in combination with one of the JakartaEE11 server profiles, e.g.:
148+
mvn clean install -Pjakartaee11,wildfly-jakartaee11-managed
149+
-->
150+
<id>jakartaee11</id>
151+
<activation>
152+
<!-- Set this to "true" to compile the project with Eclipse using the JakartaEE11 apis. -->
153+
<activeByDefault>false</activeByDefault>
154+
</activation>
155+
<properties>
156+
<version.jakarta.annotation.jakarta-annotation-api>3.0.0</version.jakarta.annotation.jakarta-annotation-api>
157+
<version.jakarta.enterprise.jakarta-enterprise-cdi-api>4.1.0</version.jakarta.enterprise.jakarta-enterprise-cdi-api>
158+
<version.jakarta.faces.jakarta-faces-api>4.1.2</version.jakarta.faces.jakarta-faces-api>
159+
<version.jakarta.servlet.jakarta-servlet-api>6.1.0</version.jakarta.servlet.jakarta-servlet-api>
160+
<version.jakarta.el.jakarta-el-api>6.0.1</version.jakarta.el.jakarta-el-api>
161+
</properties>
162+
</profile>
163+
</profiles>
164+
143165
</project>

0 commit comments

Comments
 (0)