[jboss-cvs] JBossAS SVN: r86127 - in branches/Branch_5_x: profileservice and 1 other directories.

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

Author: pgier
Date: 2009-03-19 16:04:23 -0400 (Thu, 19 Mar 2009)
New Revision: 86127

Modified:
   branches/Branch_5_x/pom.xml
   branches/Branch_5_x/profileservice/pom.xml
   branches/Branch_5_x/system/pom.xml
Log:
Fix some issues in the maven build.

Modified: branches/Branch_5_x/pom.xml
===================================================================
--- branches/Branch_5_x/pom.xml	2009-03-19 19:46:45 UTC (rev 86126)
+++ branches/Branch_5_x/pom.xml	2009-03-19 20:04:23 UTC (rev 86127)
@@ -402,7 +402,7 @@
         <module>hibernate-int</module>
         <module>console</module>
         <module>spring-int</module>
-        <module>embedded</module>
+        <!--<module>embedded</module>-->
         <module>client</module>
         <module>build</module>
       </modules>

Modified: branches/Branch_5_x/profileservice/pom.xml
===================================================================
--- branches/Branch_5_x/profileservice/pom.xml	2009-03-19 19:46:45 UTC (rev 86126)
+++ branches/Branch_5_x/profileservice/pom.xml	2009-03-19 20:04:23 UTC (rev 86127)
@@ -44,31 +44,19 @@
     <dependency>
       <groupId>org.jboss.aspects</groupId>
       <artifactId>jboss-remoting-aspects</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.jbossas</groupId>
-          <artifactId>jboss-as-system</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.jbossas</groupId>
-          <artifactId>jboss-as-aspects</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.jbossas</groupId>
-          <artifactId>jboss-as-system-jmx</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-aspects</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.jbossas</groupId>
-          <artifactId>jboss-as-system-jmx</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+	<dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-system</artifactId>
+    </dependency>
+	<dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-system-jmx</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jboss.man</groupId>
       <artifactId>jboss-managed</artifactId>

Modified: branches/Branch_5_x/system/pom.xml
===================================================================
--- branches/Branch_5_x/system/pom.xml	2009-03-19 19:46:45 UTC (rev 86126)
+++ branches/Branch_5_x/system/pom.xml	2009-03-19 20:04:23 UTC (rev 86127)
@@ -59,9 +59,9 @@
                 </tstamp>
                 <property name="build.id" value="${build.number}"/>
                 
-                <property file="../tools/etc/buildmagic/version.properties"/>
+                <!--<property file="../tools/etc/buildmagic/version.properties"/>
                 
-                <filter filtersfile="../tools/etc/buildmagic/version.properties"/>
+                <filter filtersfile="../tools/etc/buildmagic/version.properties"/>-->
                 <filter token="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
                 <filter token="build.number" value="${build.number}"/>
                 <filter token="build.id" value="${build.id}"/>