WELD-2784 Remove Jetty servlet testing module which has been exluded …

…for a long time
weld · Jun 12, 2024 · 04270a5 · 04270a5
1 parent 0286bef
commit 04270a5
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 476 deletions.
diff --git a/environments/servlet/core/pom.xml b/environments/servlet/core/pom.xml
@@ -83,14 +83,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-servlet</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-webapp</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/environments/servlet/pom.xml b/environments/servlet/pom.xml
@@ -18,9 +18,6 @@
         <module>build</module>
         <module>tests/base</module>
         <module>tests/tomcat</module>
-        <!-- Arquillian Jetty container doesn't seem to be EE 10 ready ATM -->
-        <!-- See https://github.com/arquillian/arquillian-container-jetty/issues/110#issuecomment-1164313289 -->
-        <!-- <module>tests/jetty</module>-->
     </modules>
 
     <description>
@@ -29,8 +26,7 @@
 
     <properties>
         <tomcat.version>10.1.24</tomcat.version>
-        <jetty.version>11.0.21</jetty.version>
-        <jetty9.asm.version>7.0</jetty9.asm.version>
+        <jetty.version>12.0.8</jetty.version>
         <websockets.api>2.2.0</websockets.api>
         <undertow.version>2.3.13.Final</undertow.version>
     </properties>
@@ -71,44 +67,18 @@
 
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
+                <artifactId>jetty-bom</artifactId>
                 <version>${jetty.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-plus</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-jndi</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-webapp</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-annotations</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-util</artifactId>
+                <groupId>org.eclipse.jetty.ee10</groupId>
+                <artifactId>jetty-ee10-bom</artifactId>
                 <version>${jetty.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>

diff --git a/...let/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/config/GoodBean.java b/...let/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/config/GoodBean.java
@@ -17,8 +17,11 @@
 
 package org.jboss.weld.environment.servlet.test.config;
 
+import jakarta.enterprise.context.Dependent;
+
 /**
  * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a>
  */
+@Dependent
 public class GoodBean {
 }
diff --git a/.../tests/base/src/main/java/org/jboss/weld/environment/servlet/test/config/dos/DOSBean.java b/.../tests/base/src/main/java/org/jboss/weld/environment/servlet/test/config/dos/DOSBean.java
@@ -17,8 +17,11 @@
 
 package org.jboss.weld.environment.servlet.test.config.dos;
 
+import jakarta.enterprise.context.Dependent;
+
 /**
  * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a>
  */
+@Dependent
 public class DOSBean {
 }
diff --git a/environments/servlet/tests/jetty/README.md b/environments/servlet/tests/jetty/README.md
diff --git a/environments/servlet/tests/jetty/pom.xml b/environments/servlet/tests/jetty/pom.xml
diff --git a/...ts/jetty/src/test/java/org/jboss/weld/environment/servlet/test/JettyArchiveProcessor.java b/...ts/jetty/src/test/java/org/jboss/weld/environment/servlet/test/JettyArchiveProcessor.java