dev@glassfish.java.net

pom.xml change

From: Shing Wai Chan <shing.wai.chan_at_oracle.com>
Date: Fri, 04 Mar 2011 10:51:05 -0800

Hi,

In order to fix http://java.net/jira/browse/GLASSFISH-13826,
I would like to make the following changes in pom.xml.

Please let me know if I can checkin this.
Thanks.
Shing Wai Chan


Index: common/container-common/pom.xml
===================================================================
--- common/container-common/pom.xml (revision 45406)
+++ common/container-common/pom.xml (working copy)
@@ -103,6 +103,11 @@
<artifactId>hk2</artifactId>
</dependency>
<dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.glassfish.common</groupId>
<artifactId>glassfish-naming</artifactId>
<version>${project.version}</version>

Index: web/web-glue/pom.xml
===================================================================
--- web/web-glue/pom.xml (revision 45406)
+++ web/web-glue/pom.xml (working copy)
@@ -271,41 +271,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <scope>provided</scope>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-osgi-bundle</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>web-embed-api</artifactId>
<version>${project.version}</version>