Issue #5162 CDI embedded integration improvements

Moved tests to jetty-cdi to avoid consequences to other tests in embedded
jetty · Aug 25, 2020 · 9a6f48c · 9a6f48c
1 parent c9e1fa5
commit 9a6f48c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml
@@ -50,11 +50,6 @@
       <artifactId>jetty-jmx</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-cdi</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>javax-websocket-server-impl</artifactId>
@@ -158,13 +153,6 @@
       <type>tar.gz</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.weld.servlet</groupId>
-      <artifactId>weld-servlet-core</artifactId>
-      <version>${weld.version}</version>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 
   <build>

diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml
@@ -32,6 +32,12 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.weld.servlet</groupId>
+      <artifactId>weld-servlet-core</artifactId>
+      <version>${weld.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/...ipse/jetty/embedded/EmbeddedWeldTest.java → ...ipse/jetty/embedded/EmbeddedWeldTest.java b/...ipse/jetty/embedded/EmbeddedWeldTest.java → ...ipse/jetty/embedded/EmbeddedWeldTest.java
diff --git a/...ded/src/test/resources/META-INF/beans.xml → ...cdi/src/test/resources/META-INF/beans.xml b/...ded/src/test/resources/META-INF/beans.xml → ...cdi/src/test/resources/META-INF/beans.xml
@@ -1,4 +1,4 @@
 <beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
       http://xmlns.jcp.org/xml/ns/javaee
       http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all">
-</beans>o
+</beans>