[jboss-cvs] JBossAS SVN: r68143 - in trunk: build and 2 other directories.

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

Author: pgier
Date: 2007-12-11 12:21:08 -0500 (Tue, 11 Dec 2007)
New Revision: 68143

Modified:
   trunk/build/pom.xml
   trunk/pom.xml
   trunk/tomcat/pom.xml
   trunk/webservices/pom.xml
Log:
Fixing the webservices module build.  Making maven-2.0.8 or higher a requirement.

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2007-12-11 16:39:35 UTC (rev 68142)
+++ trunk/build/pom.xml	2007-12-11 17:21:08 UTC (rev 68143)
@@ -282,13 +282,13 @@
 			</dependency>
 			<dependency>
 				<groupId>jboss</groupId>
-				<artifactId>jbossws-jboss50</artifactId>
-				<version>2.0.1.GA</version>
+				<artifactId>jbossws-framework</artifactId>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>jboss</groupId>
 				<artifactId>jbossws-spi</artifactId>
-				<version>1.0.0.GA</version>
+				<version>1.0.1-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>jboss</groupId>
@@ -303,7 +303,7 @@
 			<dependency>
 				<groupId>jboss</groupId>
 				<artifactId>web</artifactId>
-				<version>2.1.0.CR4</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>jboss.jbossws</groupId>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2007-12-11 16:39:35 UTC (rev 68142)
+++ trunk/pom.xml	2007-12-11 17:21:08 UTC (rev 68143)
@@ -14,6 +14,13 @@
   <url>http://www.jboss.com/products/jbossas</url>
   <description>JBoss Application Server (aggregator)</description>
 	
+	<!-- Maven 2.0.8 or higher must be used to build this project because of
+		-  a bug in earlier versions when handling inter-module test scope dependencies.
+		-->
+	<prerequisites>
+		<maven>2.0.8</maven>
+	</prerequisites>
+		
 	<modules>
 		<!-- The build module contains the parent pom for the other modules-->
 		<module>build</module>
@@ -40,8 +47,7 @@
 		<module>management</module>
 		<module>ejb3</module>
 		<module>tomcat</module>
-		<!-- Need to fix the webservices build and add this back later -->
-		<!--<module>webservices</module>-->
+		<module>webservices</module>
 		<module>hibernate-int</module>
 		<module>console</module>
 		<!-- <module>embedded</module> -->

Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml	2007-12-11 16:39:35 UTC (rev 68142)
+++ trunk/tomcat/pom.xml	2007-12-11 17:21:08 UTC (rev 68143)
@@ -203,7 +203,10 @@
 			<groupId>oswego-concurrent</groupId>
 			<artifactId>concurrent</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>ejb3-persistence</artifactId>
+		</dependency>
 	</dependencies>
 	
 </project>

Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml	2007-12-11 16:39:35 UTC (rev 68142)
+++ trunk/webservices/pom.xml	2007-12-11 17:21:08 UTC (rev 68143)
@@ -26,7 +26,7 @@
 		<!-- Compile (global dependencies) -->
 		<dependency>
 			<groupId>org.jboss.security</groupId>
-			<artifactId>jboss-security-spi</artifactId>
+			<artifactId>jboss-security-spi-bare</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss</groupId>
@@ -79,7 +79,7 @@
 		</dependency>
 		<dependency>
 			<groupId>jboss</groupId>
-			<artifactId>jbossws-jboss50</artifactId>
+			<artifactId>jbossws-framework</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.microcontainer</groupId>
@@ -110,7 +110,7 @@
 			<artifactId>xml-apis</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>jboss</groupId>
+			<groupId>org.jboss.security</groupId>
 			<artifactId>jbosssx-client</artifactId>
 		</dependency>
 		<dependency>