Update testing configuration as needed.

Author: manovotn

environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/UndertowTestServer.java

@@ -16,11 +16,8 @@
  */
 package org.jboss.weld.environment.se.test.shutdown.hook;
 
-import java.net.BindException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.lang3.exception.ExceptionUtils;
-
 import io.undertow.Undertow;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
@@ -49,15 +46,9 @@ static void start() throws InterruptedException {
         }
         try {
             INSTANCE.server.start();
-        } catch (Exception e) {
-            // we might have started the server too early, it's stop() action was still in progress, wait a bit and retry
-            // this was happening with JDK 11 in Jenkins only
-            if (ExceptionUtils.indexOfType(e, BindException.class) != -1) {
-                Thread.sleep(2000l);
-                INSTANCE.server.start();
-            }
-        } finally {
             STARTED.set(true);
+        } catch (Exception e) {
+            throw new IllegalStateException("There was an error starting Undertow server.", e);
         }
     }
 

jboss-tck-runner/pom.xml

@@ -446,7 +446,6 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.protocol</groupId>
                     <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
-                    <version>${arquillian.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>

pom.xml

@@ -58,10 +58,11 @@
 
         <!-- Dependency versions. KEEP IN ALPHABETICAL ORDER -->
         <apache.bcel.version>6.7.0</apache.bcel.version>
-        <arquillian.version>1.7.0.Alpha12</arquillian.version>
+        <arquillian.version>1.10.0.Final</arquillian.version>
+        <arquillian.jakarta.version>10.0.0.Final</arquillian.jakarta.version>
         <arquillian.drone.version>3.0.0-alpha.5</arquillian.drone.version>
         <arquillian.graphene.version>3.0.0-alpha.3</arquillian.graphene.version>
-        <arquillian.weld.version>3.0.2.Final</arquillian.weld.version>
+        <arquillian.weld.version>4.0.0.Final</arquillian.weld.version>
         <arquillian.se.container.version>1.0.2.Final</arquillian.se.container.version>
         <arquillian.tomcat.version>1.2.0.Final</arquillian.tomcat.version>
         <arquillian.jetty.version>1.0.0.Final</arquillian.jetty.version>
@@ -73,8 +74,6 @@
         <!-- Our variant is under src/test/tck/tck-tests.xml -->
         <cdi.tck.suite.xml.file />
         <classfilewriter.version>1.3.0.Final</classfilewriter.version>
-        <spotbugs-maven-plugin.version>4.7.3.4</spotbugs-maven-plugin.version>
-        <spotbugs-annotations-version>4.7.3</spotbugs-annotations-version>
         <groovy.version>5.0.2</groovy.version>
         <htmlunit.version>2.70.0</htmlunit.version>
         <jacoco.version>0.8.8</jacoco.version>
@@ -84,20 +83,21 @@
         <glassfish.jakarta.el.version>5.0.0-M1</glassfish.jakarta.el.version>
         <jakarta.jms.api.version>3.1.0</jakarta.jms.api.version>
         <jsf.api.version>4.0.1</jsf.api.version>
-        <jboss.logging.version>3.5.0.Final</jboss.logging.version>
-        <jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version>
+        <jboss.logging.version>3.6.1.Final</jboss.logging.version>
+        <jboss.logging.processor.version>3.0.4.Final</jboss.logging.processor.version>
         <jboss.logmanager.version>2.1.19.Final</jboss.logmanager.version>
         <jsf.impl.version>4.0.0</jsf.impl.version>
         <jsp.api.version>3.1.0</jsp.api.version>
         <jstl.api.version>3.0.0</jstl.api.version>
         <junit.version>4.13.2</junit.version>
         <log4j.version>1.2.17</log4j.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
-        <shrinkwrap.descriptors.version>2.0.0</shrinkwrap.descriptors.version>
-        <shrinkwrap.resolver.version>3.1.4</shrinkwrap.resolver.version>
+        <shrinkwrap.resolver.version>3.3.4</shrinkwrap.resolver.version>
+        <spotbugs-maven-plugin.version>4.7.3.4</spotbugs-maven-plugin.version>
+        <spotbugs-annotations-version>4.7.3</spotbugs-annotations-version>
         <testng.version>7.4.0</testng.version>
         <weld.api.version>5.0.SP3</weld.api.version>
-        <wildfly.arquillian.version>5.0.0.Alpha5</wildfly.arquillian.version>
+        <wildfly.arquillian.version>5.1.0.Final</wildfly.arquillian.version>
         <!-- Override formatter/impsort versions from Weld parent to get JDK 11 compatible versions -->
         <formatter.version>2.23.0</formatter.version>
         <impsort.version>1.9.0</impsort.version>
@@ -217,7 +217,17 @@
                 <version>${classfilewriter.version}</version>
             </dependency>
 
-            <!--Keep this Arq. BOM as first of all Arquillian dependencies in order to make it fetch correct versions!-->
+            <!--Keep Arq. BOMs as first of all Arquillian dependencies in order to make it fetch correct versions!-->
+            <!--Arquillian, Jakarta parts (enrichers etc) operating with jakarta packages -->
+            <dependency>
+                <groupId>org.jboss.arquillian.jakarta</groupId>
+                <artifactId>arquillian-jakarta-bom</artifactId>
+                <version>${arquillian.jakarta.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!--Arquillian, all other parts, APIs, containers, ... -->
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
                 <artifactId>arquillian-bom</artifactId>
@@ -226,6 +236,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.jboss.shrinkwrap</groupId>
+                <artifactId>shrinkwrap-bom</artifactId>
+                <version>${shrinkwrap.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>org.jboss.arquillian.container</groupId>
                 <artifactId>arquillian-container-spi</artifactId>
@@ -414,32 +432,14 @@
             </dependency>
 
             <dependency>
-                <groupId>org.jboss.shrinkwrap</groupId>
-                <artifactId>shrinkwrap-api</artifactId>
-                <version>${shrinkwrap.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.shrinkwrap</groupId>
-                <artifactId>shrinkwrap-spi</artifactId>
-                <version>${shrinkwrap.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.shrinkwrap</groupId>
-                <artifactId>shrinkwrap-impl-base</artifactId>
-                <version>${shrinkwrap.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-                <artifactId>shrinkwrap-descriptors-impl</artifactId>
-                <version>${shrinkwrap.descriptors.version}</version>
+                <groupId>org.jboss.shrinkwrap.resolver</groupId>
+                <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+                <version>${shrinkwrap.resolver.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.jboss.shrinkwrap.resolver</groupId>
-                <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+                <artifactId>shrinkwrap-resolver-spi</artifactId>
                 <version>${shrinkwrap.resolver.version}</version>
             </dependency>