Issue #3804

more review changes

Signed-off-by: Greg Wilkins <gregw@webtide.com>

jetty-distribution/pom.xml

@@ -140,16 +140,6 @@
                   <outputDirectory>${assembly-directory}/demo-base/webapps</outputDirectory>
                   <destFileName>async-rest.war</destFileName>
                 </artifactItem>
-                <artifactItem>
-                  <groupId>org.eclipse.jetty.tests</groupId>
-                  <artifactId>test-weld-cdi-webapp</artifactId>
-                  <version>${project.version}</version>
-                  <type>war</type>
-                  <overWrite>true</overWrite>
-                  <includes>**</includes>
-                  <outputDirectory>${assembly-directory}/demo-base/webapps</outputDirectory>
-                  <destFileName>test-weld-cdi.war</destFileName>
-                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -358,7 +348,7 @@
               <arguments>
                 <argument>jetty.home=${assembly-directory}</argument>
                 <argument>jetty.base=${assembly-directory}/demo-base</argument>
-                <argument>--add-to-startd=server,continuation,deploy,websocket,ext,resources,client,annotations,cdi-spi,jndi,servlets,jsp,jstl,http,https,threadpool</argument>
+                <argument>--add-to-startd=server,continuation,deploy,websocket,ext,resources,client,annotations,jndi,servlets,jsp,jstl,http,https,threadpool</argument>
               </arguments>
             </configuration>
             <goals>
@@ -459,13 +449,6 @@
       <type>war</type>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
-      <artifactId>test-weld-cdi-webapp</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-documentation</artifactId>

jetty-distribution/src/main/resources/demo-base/webapps/ROOT/index.html

@@ -36,7 +36,6 @@
             <li><a href="/test-spec/">Servlet 3.1 Test</a></li>
             <li><a href="/test-jaas/">JAAS Test</a></li>
             <li><a href="/test-jndi/">JNDI Test</a></li>
-            <li><a href="/test-weld-cdi/">Weld CDI Test</a></li>
             <li><a href="/async-rest/">Async Rest</a></li>
             <li><a href="/oldContextPath/">Redirected Context</a></li>
           </ul>