Merge pull request #4035 from jamezp/RESTEASY-3388-follow-up

[RESTEASY-3388] Follow ups for JUnit 5 migration

.github/workflows/wildfly-build.yml

@@ -65,7 +65,7 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
       - name: Build with Maven Java ${{ matrix.java }}
-        run: mvn clean install '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}'
+        run: mvn clean install '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}' '-Dversion.org.wildfly.plugins.wildfly-maven-plugin=5.0.0.Beta3' '-Dversion.org.wildfly.galleon-plugins=7.0.0.Beta2'
       - name: Upload surefire reports
         uses: actions/upload-artifact@v4
         if: failure()
@@ -90,7 +90,7 @@ jobs:
         profile:
           - '-Dsecurity.manager'
           - '-Dprovision.preview'
-          - '-am -Pprovision-without-resteasy,without-jackson,skip-awaiting-upgrade-tests -pl testsuite/integration-tests'
+          - '-am -Pprovision-without-resteasy,without-jackson-tests -pl resteasy-dependencies-bom,testsuite/integration-tests'
 
     steps:
       - uses: actions/checkout@v4
@@ -109,7 +109,7 @@ jobs:
           cache: 'maven'
       - name: Test with ${{ matrix.profile }} - JDK ${{ matrix.java }}
         run:  |
-          mvn clean install -U -B -fae ${{ matrix.profile }} '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}'
+          mvn clean install -U -B -fae ${{ matrix.profile }} '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}' '-Dversion.org.wildfly.plugins.wildfly-maven-plugin=5.0.0.Beta3' '-Dversion.org.wildfly.galleon-plugins=7.0.0.Beta2'
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

pom.xml

@@ -29,7 +29,7 @@
         <!-- Dependency versions -->
         <dep.arquillian-bom.version>1.7.2.Final</dep.arquillian-bom.version>
         <version.org.jboss.arquillian.container.arquillian-weld-embedded>4.0.0.Final</version.org.jboss.arquillian.container.arquillian-weld-embedded>
-        <server.version>30.0.1.Final</server.version>
+        <server.version>31.0.0.Final</server.version>
         <version.org.wildfly>${server.version}</version.org.wildfly>
         <version.org.wildfly.arquillian.wildfly-arquillian>5.0.1.Final</version.org.wildfly.arquillian.wildfly-arquillian>
 

testsuite/arquillian-utils/pom.xml

@@ -48,19 +48,10 @@
     </dependencyManagement>
 
     <dependencies>
-        <!-- arquillian general -->
         <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-depchain</artifactId>
-            <type>pom</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.inject</groupId>
-                    <artifactId>javax.inject</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
         </dependency>
-        <!-- END OF arquillian general -->
 
         <!-- Used to create a web.xml in the TestUtil -->
         <dependency>
@@ -84,7 +75,7 @@
             <artifactId>resteasy-client</artifactId>
             <version>${version.resteasy.testsuite}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-validator-provider</artifactId>
@@ -158,6 +149,12 @@
             <groupId>org.eclipse.aether</groupId>
             <artifactId>aether-transport-http</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.wildfly.plugins</groupId>
+            <artifactId>wildfly-plugin-tools</artifactId>
+            <version>1.0.0.Beta3</version>
+        </dependency>
     </dependencies>
 
     <build>

testsuite/arquillian-utils/src/main/java/org/jboss/resteasy/test/annotations/RequiresModule.java

@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ *
+ * Copyright 2024 Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.resteasy.test.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.jboss.resteasy.test.condition.RequiresModuleExecutionCondition;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Enables or disables a test based on whether the module exists. You can optionally check the version of the module
+ * to determine it's greater than the {@linkplain #minVersion() minimum version}.
+ *
+ * @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
+ */
+@Inherited
+@Documented
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(RequiresModuleExecutionCondition.class)
+public @interface RequiresModule {
+
+    /**
+     * The minimum version of the first library resource in the module.
+     *
+     * @return the minimum version
+     */
+    String minVersion() default "";
+
+    /**
+     * The id of the issue which causes this issue.
+     *
+     * @return the issue id
+     */
+    String issueId() default "";
+
+    /**
+     * The reason message for disabled tests.
+     *
+     * @return the reason message
+     */
+    String reason() default "";
+
+    /**
+     * The module that is required for the test to run.
+     *
+     * @return the module name
+     */
+    String value();
+}