Remove dup cdi jars from lib; use individual weld jars not aggregate
diff --git a/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod b/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
index 6d55442..3ae7de0 100644
--- a/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
+++ b/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
@@ -11,12 +11,23 @@
[files]
lib/cdi/
-maven://org.jboss.weld.servlet/weld-servlet/2.2.9.Final|lib/cdi/weld-servlet-2.2.9.Final.jar
+maven://javax.enterprise/cdi-api/1.2|lib/cdi/javax.enterprise.cdi-api-1.2.jar
+maven://javax.interceptor/javax.interceptor-api/1.2|lib/cdi/javax.interceptor-api-1.2.jar
+maven://javax.inject/javax.inject/1|lib/cdi/javax.inject-1.0.jar
+maven://org.jboss.weld.servlet/weld-servlet-core/2.2.9.Final|lib/cdi/weld-servlet-core-2.2.9.Final.jar
+maven://org.jboss.weld.environment/weld-environment-common/2.2.9.Final|lib/cdi/weld-environment-common-2.2.9.Final.jar
+maven://org.jboss.weld/weld-core-impl/2.2.9.Final|lib/cdi/weld-core-impl-2.2.9.Final.jar
+maven://org.jboss.classfilewriter/jboss-classfilewriter/1.0.5.Final|lib/cdi/jboss-classfilewriter-1.0.5.Final.jar
+maven://com.google.guava/guava/13.0.1|lib/cdi/com.google.guava.guava-13.0.1.jar
+maven://org.jboss.weld/weld-spi/2.2.SP3|lib/cdi/weld-spi-2.2.SP3.jar
+maven://org.jboss.weld/weld-api/2.2.SP3|lib/cdi/weld-api-2.2.SP3.jar
+maven://org.jboss.logging/jboss-logging/3.1.3.GA|lib/cdi/jboss-logging-3.1.3.GA.jar
+
[lib]
-lib/cdi/weld-servlet-2.2.9.Final.jar
-lib/cdi/cdi-core-${jetty.version}.jar
-lib/cdi/cdi-servlet-${jetty.version}.jar
+lib/cdi/*.jar
+lib/cdi-core-${jetty.version}.jar
+lib/cdi-servlet-${jetty.version}.jar
[xml]
etc/jetty-cdi.xml
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index ee7e3df..82087b0 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -432,19 +432,6 @@
</configuration>
</execution>
<execution>
- <id>copy-cdi-deps</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>org.eclipse.jetty.cdi</includeGroupIds>
- <!-- includeArtifactIds>cdi-core,cdi-servlet,cdi-websocket</includeArtifactIds -->
- <includeTypes>jar</includeTypes>
- <outputDirectory>${assembly-directory}/lib/cdi</outputDirectory>
- </configuration>
- </execution>
- <execution>
<id>copy-jndi-deps</id>
<phase>generate-resources</phase>
<goals>
