[jbossws-commits] JBossWS SVN: r8141 - in stack/native/trunk: modules/core and 1 other directories.
Author: alessio.soldano(a)jboss.com
Date: 2008-08-27 08:15:49 -0400 (Wed, 27 Aug 2008)
New Revision: 8141
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/embedded/pom.xml
stack/native/trunk/pom.xml
Log:
Moving microcontainer dependencies out of the main pom to use the artifacts pulled in by
the container integration when running the tests - fix embedded tests regression
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-08-27 07:00:43 UTC (rev 8140)
+++ stack/native/trunk/modules/core/pom.xml 2008-08-27 12:15:49 UTC (rev 8141)
@@ -13,6 +13,10 @@
<version>3.0.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+
+ <properties>
+
<jboss.microcontainer.version>2.0.0.Beta17</jboss.microcontainer.version>
+ </properties>
<!-- Dependencies -->
<dependencies>
@@ -68,6 +72,7 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
<scope>provided</scope>
+ <version>${jboss.microcontainer.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
Modified: stack/native/trunk/modules/embedded/pom.xml
===================================================================
--- stack/native/trunk/modules/embedded/pom.xml 2008-08-27 07:00:43 UTC (rev 8140)
+++ stack/native/trunk/modules/embedded/pom.xml 2008-08-27 12:15:49 UTC (rev 8141)
@@ -5,7 +5,7 @@
<name>JBoss Web Services - Stack Native Embedded</name>
<artifactId>jbossws-native-embedded</artifactId>
<packaging>jar</packaging>
-
+
<!-- Parent -->
<parent>
<groupId>org.jboss.ws.native</groupId>
@@ -14,6 +14,10 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <properties>
+
<jboss.microcontainer.version>2.0.0.Beta17</jboss.microcontainer.version>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
<!-- jbossws dependencies -->
@@ -36,6 +40,7 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
<scope>provided</scope>
+ <version>${jboss.microcontainer.version}</version>
</dependency>
</dependencies>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-08-27 07:00:43 UTC (rev 8140)
+++ stack/native/trunk/pom.xml 2008-08-27 12:15:49 UTC (rev 8141)
@@ -71,7 +71,6 @@
<jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version>
<jboss.jbosssx.version>2.0.2.CR6</jboss.jbosssx.version>
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
-
<jboss.microcontainer.version>2.0.0.Beta17</jboss.microcontainer.version>
<jboss.remoting.version>2.4.0.CR1</jboss.remoting.version>
<jboss.jaxr.version>1.2.0.SP2</jboss.jaxr.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
@@ -241,17 +240,6 @@
<artifactId>jboss-remoting</artifactId>
<version>${jboss.remoting.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${jboss.microcontainer.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- transitive dependencies -->
<dependency>