diff options
Diffstat (limited to 'jetty-cdi')
-rw-r--r-- | jetty-cdi/cdi-core/pom.xml | 12 | ||||
-rw-r--r-- | jetty-cdi/cdi-full-servlet/pom.xml | 54 | ||||
-rw-r--r-- | jetty-cdi/cdi-servlet/pom.xml | 23 | ||||
-rw-r--r-- | jetty-cdi/cdi-websocket/pom.xml | 12 | ||||
-rw-r--r-- | jetty-cdi/test-cdi-webapp/pom.xml | 15 |
5 files changed, 114 insertions, 2 deletions
diff --git a/jetty-cdi/cdi-core/pom.xml b/jetty-cdi/cdi-core/pom.xml index f7f5a3f2de..8e798f464e 100644 --- a/jetty-cdi/cdi-core/pom.xml +++ b/jetty-cdi/cdi-core/pom.xml @@ -23,9 +23,21 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.2</version> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-core</artifactId> <version>${weld.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.weld.se</groupId> diff --git a/jetty-cdi/cdi-full-servlet/pom.xml b/jetty-cdi/cdi-full-servlet/pom.xml new file mode 100644 index 0000000000..87030b32e4 --- /dev/null +++ b/jetty-cdi/cdi-full-servlet/pom.xml @@ -0,0 +1,54 @@ +<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.cdi</groupId> + <artifactId>jetty-cdi-parent</artifactId> + <version>9.3.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>cdi-full-servlet</artifactId> + <name>Jetty :: CDI :: Dependencies</name> + <url>http://www.eclipse.org/jetty</url> + <packaging>pom</packaging> + <properties> + <weld.version>2.2.9.Final</weld.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.eclipse.jetty.cdi</groupId> + <artifactId>cdi-servlet</artifactId> + <version>${project.version}</version> +<!-- + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_3.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.annotation</groupId> + <artifactId>jboss-annotations-api_1.2_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.interceptor</groupId> + <artifactId>jboss-interceptors-api_1.2_spec</artifactId> + </exclusion> + </exclusions> +--> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.mortbay.jasper</groupId> + <artifactId>apache-jsp</artifactId> + <version>${jsp.version}</version> + </dependency> + </dependencies> +</project> diff --git a/jetty-cdi/cdi-servlet/pom.xml b/jetty-cdi/cdi-servlet/pom.xml index 05e9d3d4e5..3cc004b183 100644 --- a/jetty-cdi/cdi-servlet/pom.xml +++ b/jetty-cdi/cdi-servlet/pom.xml @@ -54,15 +54,34 @@ </dependency> <dependency> <groupId>org.jboss.weld.servlet</groupId> - <artifactId>weld-servlet</artifactId> + <artifactId>weld-servlet-core</artifactId> <version>${weld.version}</version> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_3.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.annotation</groupId> + <artifactId>jboss-annotations-api_1.2_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.interceptor</groupId> + <artifactId>jboss-interceptors-api_1.2_spec</artifactId> + </exclusion> + </exclusions> </dependency> + <!-- below here lie testing dragons --> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>apache-jsp</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> - <!-- below here lie testing dragons --> <dependency> <groupId>org.eclipse.jetty.toolchain</groupId> <artifactId>jetty-test-helper</artifactId> diff --git a/jetty-cdi/cdi-websocket/pom.xml b/jetty-cdi/cdi-websocket/pom.xml index e44eaff38b..5ee468605e 100644 --- a/jetty-cdi/cdi-websocket/pom.xml +++ b/jetty-cdi/cdi-websocket/pom.xml @@ -27,6 +27,18 @@ </dependency> <!-- below here lie testing dragons --> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>apache-jsp</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>${weld.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.jboss.weld.se</groupId> <artifactId>weld-se-core</artifactId> <version>${weld.version}</version> diff --git a/jetty-cdi/test-cdi-webapp/pom.xml b/jetty-cdi/test-cdi-webapp/pom.xml index 15ca5299f3..5fa452ca27 100644 --- a/jetty-cdi/test-cdi-webapp/pom.xml +++ b/jetty-cdi/test-cdi-webapp/pom.xml @@ -86,6 +86,21 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>${project.version}</version> + <configuration> + </configuration> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty.cdi</groupId> + <artifactId>cdi-full-servlet</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + </dependencies> + </plugin> </plugins> </build> </project> |