Skip to content

HV-2075 Upgrade Arquillain and WildFly versions for JDK24/25 testing #1544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 7, 2025
+11 −33
Merged

HV-2075 Upgrade Arquillain and WildFly versions for JDK24/25 testing #1544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc51183
HV-2075 Upgrade to wildfly-arquillian-container-managed 5.1.0.Beta9 f…
marko-bekhta Dec 9, 2024
d75d957
HV-2075 Test against Wildfly 35.Beta1 with JDK24/25
marko-bekhta Jan 7, 2025
e719823
HV-2075 Don't skip integration tests for JDK24/25
marko-bekhta Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions integrationtest/wildfly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

<hibernate-validator-parent.path>../..</hibernate-validator-parent.path>
<skip.wildfly.integration.test.hibernate.validator>false</skip.wildfly.integration.test.hibernate.validator>
<skip.failsafe.execution>false</skip.failsafe.execution>
</properties>

<dependencies>
Expand Down Expand Up @@ -180,7 +179,6 @@
<goal>verify</goal>
</goals>
<configuration>
<skip>${skip.failsafe.execution}</skip>
<systemPropertyVariables>
<arquillian.launch>wildfly-current</arquillian.launch>
</systemPropertyVariables>
Expand Down Expand Up @@ -260,29 +258,5 @@
<surefire.jvm.args.add-opens>--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED</surefire.jvm.args.add-opens>
</properties>
</profile>
<profile>
<id>testWithJdk24</id>
<activation>
<property>
<name>java-version.test.release</name>
<value>24</value>
</property>
</activation>
<properties>
<skip.failsafe.execution>true</skip.failsafe.execution>
</properties>
</profile>
<profile>
<id>testWithJdk25</id>
<activation>
<property>
<name>java-version.test.release</name>
<value>25</value>
</property>
</activation>
<properties>
<skip.failsafe.execution>true</skip.failsafe.execution>
</properties>
</profile>
</profiles>
</project>
18 changes: 11 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
<version.org.jboss.logging.jboss-logging-tools>3.0.3.Final</version.org.jboss.logging.jboss-logging-tools>

<!-- Currently supported version of WildFly -->
<!-- Update JDK 24 configuration when changing this version: -->
<version.wildfly>34.0.1.Final</version.wildfly>
<!-- Used to create a patch file for the second version of WildFly we support -->
<!--<version.wildfly.secondary>18.0.1.Final</version.wildfly.secondary>-->
Expand Down Expand Up @@ -165,8 +166,8 @@
They should be aligned with the ones from the Wildfly version we support
See http://search.maven.org/#search|gav|1|g%3A"org.wildfly"%20AND%20a%3A"wildfly-parent"
-->
<version.org.jboss.weld.weld>6.0.0.Beta4</version.org.jboss.weld.weld>
<version.org.wildfly.arquillian>5.0.0.Alpha3</version.org.wildfly.arquillian>
<version.org.jboss.weld.weld>6.0.0.Final</version.org.jboss.weld.weld>
<version.org.wildfly.arquillian>5.1.0.Beta9</version.org.wildfly.arquillian>
<version.jakarta.jakartaee-bom>11.0.0-M4</version.jakarta.jakartaee-bom>
<!--
These are now managed by the BOM ^ but we want to have version properties available to us
Expand Down Expand Up @@ -399,7 +400,8 @@

<arquillian.wildfly.jvm.args.add-opens></arquillian.wildfly.jvm.args.add-opens>
<arquillian.wildfly.jvm.args.add-modules></arquillian.wildfly.jvm.args.add-modules>
<arquillian.wildfly.jvm.args>-Duser.language=en -Duser.country=US ${arquillian.wildfly.jvm.args.add-opens} ${arquillian.wildfly.jvm.args.add-modules}</arquillian.wildfly.jvm.args>
<arquillian.jvm.args.java-version></arquillian.jvm.args.java-version>
<arquillian.wildfly.jvm.args>-Duser.language=en -Duser.country=US ${arquillian.wildfly.jvm.args.add-opens} ${arquillian.wildfly.jvm.args.add-modules} ${arquillian.jvm.args.java-version}</arquillian.wildfly.jvm.args>

<!-- JDK version required for the build -->
<!-- Remember to update README when changing the version here. -->
Expand Down Expand Up @@ -1790,8 +1792,6 @@
<properties>
<!-- ForbiddenAPIs doesn't work with JDK20+ yet -->
<forbiddenapis.skip>true</forbiddenapis.skip>
<!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK21+ -->
<surefire.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</surefire.jvm.args.java-version>
</properties>
</profile>
<profile>
Expand All @@ -1805,8 +1805,6 @@
<properties>
<!-- ForbiddenAPIs doesn't work with JDK23+ yet -->
<forbiddenapis.skip>true</forbiddenapis.skip>
<!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK23+ -->
<surefire.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</surefire.jvm.args.java-version>
</properties>
</profile>
<profile>
Expand All @@ -1818,10 +1816,13 @@
</property>
</activation>
<properties>
<!-- Remove once there's a 35 Final available -->
<version.wildfly>35.0.0.Beta1</version.wildfly>
<!-- ForbiddenAPIs doesn't work with JDK24+ yet -->
<forbiddenapis.skip>true</forbiddenapis.skip>
<!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK24+ -->
<surefire.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</surefire.jvm.args.java-version>
<arquillian.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</arquillian.jvm.args.java-version>
</properties>
</profile>
<profile>
Expand All @@ -1833,10 +1834,13 @@
</property>
</activation>
<properties>
<!-- Remove once there's a 35 Final available -->
<version.wildfly>35.0.0.Beta1</version.wildfly>
<!-- ForbiddenAPIs doesn't work with JDK25+ yet -->
<forbiddenapis.skip>true</forbiddenapis.skip>
<!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK25+ -->
<surefire.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</surefire.jvm.args.java-version>
<arquillian.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</arquillian.jvm.args.java-version>
</properties>
</profile>
<profile>
Expand Down
Loading