[jboss-cvs] JBossAS SVN: r108148 - trunk/embedded.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2010-09-15 10:04:42 -0400 (Wed, 15 Sep 2010)
New Revision: 108148

Modified:
   trunk/embedded/pom.xml
Log:
[JBAS-8404] Exclude osgi distribution to avoid dependency conflicts in servlet api

Modified: trunk/embedded/pom.xml
===================================================================
--- trunk/embedded/pom.xml	2010-09-15 13:40:29 UTC (rev 108147)
+++ trunk/embedded/pom.xml	2010-09-15 14:04:42 UTC (rev 108148)
@@ -97,6 +97,12 @@
       <version>${version.org.jboss.jbossas}</version>
       <scope>test</scope>
       <type>pom</type>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss.jbossas.osgi</groupId>
+          <artifactId>jboss-as-osgi-distribution</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- $JBOSS_HOME fully built, but not yet installed -->
     <dependency>