From ee4726985ea6f52a1719c73e5cd25cf00db03a84 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Thu, 6 Jun 2019 14:58:06 -0500
Subject: [PATCH] Issue #3731 - removing remaining references to experimental
 CDI 1 libs

---
 jetty-bom/pom.xml                                   | 10 ----------
 .../administration/startup/screen-list-modules.adoc | 13 -------------
 jetty-home/pom.xml                                  |  5 -----
 3 files changed, 28 deletions(-)

diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
index aabe661b69c..e4ab0d002ad 100644
--- a/jetty-bom/pom.xml
+++ b/jetty-bom/pom.xml
@@ -110,16 +110,6 @@
         <artifactId>jetty-ant</artifactId>
         <version>9.4.20-SNAPSHOT</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty.cdi</groupId>
-        <artifactId>cdi-core</artifactId>
-        <version>9.4.20-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty.cdi</groupId>
-        <artifactId>cdi-servlet</artifactId>
-        <version>9.4.20-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-client</artifactId>
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc
index 3702cccecd1..fce1982a38e 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc
@@ -56,19 +56,6 @@ Modules for tag '*':
         LIB: lib/apache-jstl/*.jar
     Enabled: transitive provider of apache-jstl for jstl
 
-     Module: cdi
-           : Experimental CDI/Weld integration
-     Depend: cdi1
-
-     Module: cdi1
-           : Experimental CDI/Weld integration
-           : Deprecated in favour of cdi2 module.
-     Depend: deploy, annotations, plus, jsp
-        LIB: lib/cdi/*.jar
-        LIB: lib/cdi-core-${jetty.version}.jar
-        LIB: lib/cdi-servlet-${jetty.version}.jar
-        XML: etc/jetty-cdi.xml
-
      Module: cdi2
            : Jetty setup to support Weld/CDI2 with WELD inside the webapp
      Depend: deploy
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index cef23d04e3b..1e9c227840e 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -672,11 +672,6 @@
       <artifactId>jetty-spring</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.cdi</groupId>
-      <artifactId>cdi-servlet</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>