From 9a6f48ce74c45f15348bff075f1e5342f9d5f535 Mon Sep 17 00:00:00 2001
From: gregw <gregw@webtide.com>
Date: Tue, 25 Aug 2020 15:26:39 +0200
Subject: [PATCH] Issue #5162 CDI embedded integration improvements

Moved tests to jetty-cdi to avoid consequences to other tests in embedded
---
 examples/embedded/pom.xml                            | 12 ------------
 jetty-cdi/pom.xml                                    |  6 ++++++
 .../org/eclipse/jetty/embedded/EmbeddedWeldTest.java |  0
 .../src/test/resources/META-INF/beans.xml            |  2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)
 rename {examples/embedded => jetty-cdi}/src/test/java/org/eclipse/jetty/embedded/EmbeddedWeldTest.java (100%)
 rename {examples/embedded => jetty-cdi}/src/test/resources/META-INF/beans.xml (96%)

diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml
index 38a9012625e3..8bef9fafb889 100644
--- 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
index c06cc91e72a9..f1dd8a4b8a19 100644
--- 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/examples/embedded/src/test/java/org/eclipse/jetty/embedded/EmbeddedWeldTest.java b/jetty-cdi/src/test/java/org/eclipse/jetty/embedded/EmbeddedWeldTest.java
similarity index 100%
rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/EmbeddedWeldTest.java
rename to jetty-cdi/src/test/java/org/eclipse/jetty/embedded/EmbeddedWeldTest.java
diff --git a/examples/embedded/src/test/resources/META-INF/beans.xml b/jetty-cdi/src/test/resources/META-INF/beans.xml
similarity index 96%
rename from examples/embedded/src/test/resources/META-INF/beans.xml
rename to jetty-cdi/src/test/resources/META-INF/beans.xml
index 5fd351cfd218..abb1108351b5 100644
--- a/examples/embedded/src/test/resources/META-INF/beans.xml
+++ b/jetty-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
\ No newline at end of file
+</beans>
\ No newline at end of file