From 8e1fc56f6fb451e9c60a254a90d025552b5f2573 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Thu, 9 Oct 2014 15:12:15 -0700
Subject: [PATCH] CDI module now depends on JSP module

+ weld requires javax.el + jsp to function
---
 jetty-cdi/pom.xml                             | 39 +++++++++++++++++++
 .../src/main/config}/modules/cdi.mod          |  7 +++-
 jetty-distribution/pom.xml                    |  5 +++
 tests/test-cdi/cdi-webapp-it/pom.xml          |  1 +
 4 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 jetty-cdi/pom.xml
 rename {jetty-distribution/src/main/resources => jetty-cdi/src/main/config}/modules/cdi.mod (60%)

diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml
new file mode 100644
index 00000000000..5440c4d7e4f
--- /dev/null
+++ b/jetty-cdi/pom.xml
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty</groupId>
+    <artifactId>jetty-project</artifactId>
+    <version>9.2.4-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jetty-cdi</artifactId>
+  <name>Jetty :: CDI Configurations</name>
+  <url>http://www.eclipse.org/jetty</url>
+  <packaging>jar</packaging>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.${project.artifactId}</bundle-symbolic-name>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>config</descriptorRef>
+              </descriptorRefs>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+  </dependencies>
+</project>
diff --git a/jetty-distribution/src/main/resources/modules/cdi.mod b/jetty-cdi/src/main/config/modules/cdi.mod
similarity index 60%
rename from jetty-distribution/src/main/resources/modules/cdi.mod
rename to jetty-cdi/src/main/config/modules/cdi.mod
index 60190714d7b..e352a7113e4 100644
--- a/jetty-distribution/src/main/resources/modules/cdi.mod
+++ b/jetty-cdi/src/main/config/modules/cdi.mod
@@ -4,13 +4,16 @@
 
 [depend]
 annotations
+# JSP (and EL) are requirements for CDI and Weld
+jsp
 
 [files]
 lib/weld/
-http://central.maven.org/maven2/org/jboss/weld/servlet/weld-servlet/2.2.4.Final/weld-servlet-2.2.4.Final.jar|lib/weld/weld-servlet-2.2.4.Final.jar
+http://central.maven.org/maven2/org/jboss/weld/servlet/weld-servlet/2.2.5.Final/weld-servlet-2.2.5.Final.jar|lib/weld/weld-servlet-2.2.5.Final.jar
 
 [lib]
-lib/weld/weld-servlet-2.2.4.Final.jar
+lib/weld/weld-servlet-2.2.5.Final.jar
+lib/jetty-cdi-${jetty.version}.jar
 
 [license]
 Weld is an open source project hosted on Github and released under the Apache 2.0 license.
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index dfec0abd0ef..4a85e9a24ff 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -790,6 +790,11 @@
       <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</groupId>
       <artifactId>jetty-jaas</artifactId>
diff --git a/tests/test-cdi/cdi-webapp-it/pom.xml b/tests/test-cdi/cdi-webapp-it/pom.xml
index ba986be85a4..513ae874b82 100644
--- a/tests/test-cdi/cdi-webapp-it/pom.xml
+++ b/tests/test-cdi/cdi-webapp-it/pom.xml
@@ -30,6 +30,7 @@
   <url>http://www.eclipse.org/jetty</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <bundle-symbolic-name>${project.groupId}.cdi.webapp.it</bundle-symbolic-name>
     <scripts-dir>${project.basedir}/src/test/scripts</scripts-dir>
     <test-base-dir>${project.build.directory}/test-base</test-base-dir>