[jboss-cvs] JBossAS SVN: r70515 - trunk/thirdparty.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Mar 6 15:56:56 EST 2008


Author: pgier
Date: 2008-03-06 15:56:56 -0500 (Thu, 06 Mar 2008)
New Revision: 70515

Modified:
   trunk/thirdparty/pom.xml
Log:
[JBBUILD-453] Adding testsuite-libraries.ent file for test scope dependencies.  Moved a couple of dependency version to the parent pom.

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-03-06 20:56:23 UTC (rev 70514)
+++ trunk/thirdparty/pom.xml	2008-03-06 20:56:56 UTC (rev 70515)
@@ -1,24 +1,23 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossas</groupId>
-		<artifactId>jboss-as-parent</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossas</groupId>
-	<artifactId>jboss-as-thirdparty</artifactId>
-	<packaging>pom</packaging>
-	<name>JBoss Application Server Thirdparty Build</name>
-	<url>http://www.jboss.com/products/jbossas</url>
-	<description>JBoss Application Server (system module)</description>
-	<build>
-		<sourceDirectory>src/main</sourceDirectory>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.jboss.jbossas</groupId>
+    <artifactId>jboss-as-parent</artifactId>
+    <version>5.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jboss.jbossas</groupId>
+  <artifactId>jboss-as-thirdparty</artifactId>
+  <packaging>pom</packaging>
+  <name>JBoss Application Server Thirdparty Build</name>
+  <url>http://www.jboss.com/products/jbossas</url>
+  <description>JBoss Application Server (system module)</description>
+  <build>
+    <sourceDirectory>src/main</sourceDirectory>
     <plugins>
-			<plugin>
-				<groupId>org.jboss.maven.plugins</groupId>
-				<artifactId>maven-buildmagic-thirdparty-plugin</artifactId>
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-buildmagic-thirdparty-plugin</artifactId>
         <version>2.0-SNAPSHOT</version>
         <executions>
           <execution>
@@ -27,6 +26,13 @@
               <goal>build-thirdparty</goal>
             </goals>
             <phase>package</phase>
+            <configuration>
+              <librariesEnt>${project.build.directory}/testsuite-libraries.ent</librariesEnt>
+              <aliasesEnt>${basedir}/../tools/etc/buildmagic/aliases.ent</aliasesEnt>
+              <includedScopes>
+                <scope>compile</scope>
+              </includedScopes>
+            </configuration>
           </execution>
           <execution>
             <id>build-thirparty-testsuite</id>
@@ -35,12 +41,15 @@
             </goals>
             <phase>package</phase>
             <configuration>
-              <librariesEnt>testsuite-libraries.ent</librariesEnt>
+              <librariesEnt>${project.build.directory}/testsuite-libraries.ent</librariesEnt>
+              <aliasesEnt>${basedir}/../tools/etc/buildmagic/aliases.ent</aliasesEnt>
+              <includedScopes>
+                <scope>test</scope>
+              </includedScopes>
             </configuration>
           </execution>
         </executions>
         <configuration>
-          <outputDirectory>${basedir}</outputDirectory>
           <mappedDependencies>
             <dependency>
               <groupId>commons-lang</groupId>
@@ -291,7 +300,7 @@
                 <componentId>jboss.integration</componentId>
               </mapping>
             </dependency>
-             <dependency>
+            <dependency>
               <groupId>org.jboss</groupId>
               <artifactId>jboss-corba-ots-spi</artifactId>
               <mapping>
@@ -397,11 +406,11 @@
               </mapping>
             </dependency>
             <!--<dependency>
-              <groupId>jboss</groupId>
-              <artifactId>jbossws-native50</artifactId>
-              <mapping>
-                <componentId>jboss.jbossws-native50</componentId>
-              </mapping>
+            <groupId>jboss</groupId>
+            <artifactId>jbossws-native50</artifactId>
+            <mapping>
+            <componentId>jboss.jbossws-native50</componentId>
+            </mapping>
             </dependency>-->
             <dependency>
               <groupId>jboss</groupId>
@@ -608,15 +617,13 @@
               </mapping>
             </dependency>
             
-
-            
             <!-- End mapped dependecies -->
             
           </mappedDependencies>
         </configuration>
-			</plugin>
+      </plugin>
     </plugins>
-	</build>
+  </build>
   
   <!-- Project dependencies resolved by maven -->
   <dependencies>
@@ -688,6 +695,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-ant-tasks</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>myfaces</groupId>
@@ -764,28 +772,25 @@
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.6.1-jboss</version>
     </dependency>
     <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
-      <version>1.1</version>
     </dependency>
     
     <!--<dependency>
-      <groupId>gjt-jpl-util</groupId>
-      <artifactId>jpl-util</artifactId>
-      <version>1.0.12-brew</version>
+    <groupId>gjt-jpl-util</groupId>
+    <artifactId>jpl-util</artifactId>
+    <version>1.0.12-brew</version>
     </dependency>
     <dependency>
-      <groupId>gjt-jpl-util</groupId>
-      <artifactId>jpl-pattern</artifactId>
-      <version>1.0.12-brew</version>
+    <groupId>gjt-jpl-util</groupId>
+    <artifactId>jpl-pattern</artifactId>
+    <version>1.0.12-brew</version>
     </dependency>-->
     
     <dependency>
@@ -818,6 +823,11 @@
       <artifactId>hsqldb</artifactId>
     </dependency>
     <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>jacorb</groupId>
       <artifactId>idl</artifactId>
     </dependency>
@@ -868,7 +878,7 @@
       <groupId>org.jboss</groupId>
       <artifactId>jboss-classloading-spi</artifactId>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-corba-ots-spi</artifactId>
     </dependency>
@@ -877,8 +887,8 @@
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
     <!--<dependency>
-      <groupId>jboss/jaxr</groupId>
-      <version>1.2.0.GA</version>
+    <groupId>jboss/jaxr</groupId>
+    <version>1.2.0.GA</version>
     </dependency>-->
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
@@ -953,10 +963,10 @@
       <groupId>org.jboss.security</groupId>
       <artifactId>jbosssx-client</artifactId>
     </dependency>
-   
+    
     <!--<dependency>
-      <groupId>jboss/jbossts</groupId>
-      <version>4.3.0.BETA2</version>
+    <groupId>jboss/jbossts</groupId>
+    <version>4.3.0.BETA2</version>
     </dependency>-->
     <dependency>
       <groupId>org.jboss</groupId>
@@ -979,8 +989,8 @@
       <artifactId>jbossws-framework</artifactId>
     </dependency>
     <!--<dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jbossws-native50</artifactId>
+    <groupId>jboss</groupId>
+    <artifactId>jbossws-native50</artifactId>
     </dependency>-->
     <dependency>
       <groupId>jboss</groupId>
@@ -1115,9 +1125,9 @@
       <version>0.9.1</version>
     </dependency>
     <!--<dependency>
-      <groupId>objectweb-joramtests</groupId>
-      <artifactId>joramtests</artifactId>
-      <version>1.5</version>
+    <groupId>objectweb-joramtests</groupId>
+    <artifactId>joramtests</artifactId>
+    <version>1.5</version>
     </dependency>-->
     <dependency>
       <groupId>odmg</groupId>
@@ -1198,7 +1208,7 @@
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>com.sun</groupId>
       <artifactId>jsf-impl</artifactId>
@@ -1209,8 +1219,8 @@
     </dependency>
     
     <!--<dependency>
-      <groupId>sun-jstl</groupId>
-      <version>1.2</version>
+    <groupId>sun-jstl</groupId>
+    <version>1.2</version>
     </dependency>-->
     <dependency>
       <groupId>sun-opends</groupId>
@@ -1282,7 +1292,6 @@
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
     </dependency>
-    
   </dependencies>
-	
+  
 </project>




More information about the jboss-cvs-commits mailing list