[jboss-cvs] JBossAS SVN: r92027 - in trunk: component-matrix and 1 other directory.

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

Author: pgier
Date: 2009-08-05 17:04:09 -0400 (Wed, 05 Aug 2009)
New Revision: 92027

Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/component-matrix/pom.xml
Log:
Put sar files in runtime scope.  Change type from "jboss-sar" to "sar" to work better with the maven ant tasks.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-08-05 20:32:14 UTC (rev 92026)
+++ trunk/build/build.xml	2009-08-05 21:04:09 UTC (rev 92027)
@@ -47,7 +47,7 @@
       -->
     <maven:dependencies filesetId="pom.dependencies"
                         versionsId="pom.dependencies.versions"
-                        scopes="compile, runtime" type="pom, jar, zip, war"
+                        scopes="compile, runtime"
                         addArtifactFileSetRefs="true"
                         cacheDependencyRefs="true">
       <pom file="${thirdparty.pom.file}"/>
@@ -57,17 +57,6 @@
               classname="org.apache.maven.artifact.ant.VersionMapper"
               from="${pom.dependencies.versions}" to="flatten" />
 
-    <!-- Due to MANTTASKS-148, files with jboss-sar packaging cannot be resolved directly in the pom -->
-    <xmlproperty file="../component-matrix/pom.xml" prefix="component-matrix"/>
-    <maven:dependencies addArtifactFileSetRefs="true">
-      <dependency groupId="jboss.jbossts" artifactId="jbossts-tools" 
-                  version="${component-matrix.project.properties.version.jboss.jbossts}" type="sar"/>
-      <dependency groupId="jboss.jbossts" artifactId="jbossxts" 
-                  version="${component-matrix.project.properties.version.jboss.jbossts}" type="sar"/>
-      <dependency groupId="org.jboss.jaxr" artifactId="juddi-service" 
-                  version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
-    </maven:dependencies>
-
   </target>
 
   <!-- ================================================================== -->

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2009-08-05 20:32:14 UTC (rev 92026)
+++ trunk/build/pom.xml	2009-08-05 21:04:09 UTC (rev 92027)
@@ -173,12 +173,14 @@
     <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossts-tools</artifactId>
-      <type>jboss-sar</type>
+      <type>sar</type>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossxts</artifactId>
-      <type>jboss-sar</type>
+      <type>sar</type>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>jboss.jbossts</groupId>
@@ -289,7 +291,7 @@
     <dependency>
       <groupId>org.jboss.jaxr</groupId>
       <artifactId>juddi-service</artifactId>
-      <type>jboss-sar</type>
+      <type>sar</type>
     </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-08-05 20:32:14 UTC (rev 92026)
+++ trunk/component-matrix/pom.xml	2009-08-05 21:04:09 UTC (rev 92027)
@@ -711,7 +711,7 @@
         <groupId>org.jboss.jaxr</groupId>
         <artifactId>juddi-service</artifactId>
         <version>${version.jboss.jaxr}</version>
-        <type>jboss-sar</type>
+        <type>sar</type>
         <exclusions>
           <exclusion>
             <groupId>jboss</groupId>
@@ -776,7 +776,7 @@
           <groupId>jboss.jbossts</groupId>
           <artifactId>jbossts-tools</artifactId>
           <version>${version.jboss.jbossts}</version>
-          <type>jboss-sar</type>
+          <type>sar</type>
         </dependency>
 
         <dependency>
@@ -789,7 +789,7 @@
           <groupId>jboss.jbossts</groupId>
           <artifactId>jbossxts</artifactId>
           <version>${version.jboss.jbossts}</version>
-          <type>jboss-sar</type>
+          <type>sar</type>
         </dependency>
       
       <dependency>