[seam-commits] Seam SVN: r11223 - branches/enterprise/JBPAPP_5_0/build.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2009-06-30 09:20:51 -0400 (Tue, 30 Jun 2009)
New Revision: 11223

Modified:
   branches/enterprise/JBPAPP_5_0/build/core.pom.xml
   branches/enterprise/JBPAPP_5_0/build/excel.pom.xml
   branches/enterprise/JBPAPP_5_0/build/mail.pom.xml
   branches/enterprise/JBPAPP_5_0/build/root.pom.xml
   branches/enterprise/JBPAPP_5_0/build/ui.pom.xml
Log:
JBPAPP-2156

Modified: branches/enterprise/JBPAPP_5_0/build/core.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/core.pom.xml	2009-06-30 13:17:19 UTC (rev 11222)
+++ branches/enterprise/JBPAPP_5_0/build/core.pom.xml	2009-06-30 13:20:51 UTC (rev 11223)
@@ -271,13 +271,12 @@
 		<optional>true</optional>
 	 </dependency>
 
-    <!-- Surefire can't cope with such a new version of testng, so we have to specify it
-      here, otherwise ui build fails -->
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>5.6</version>
+      <version>${version.testng}</version>
       <optional>true</optional>
+      <classifier>jdk15</classifier>      
       <exclusions>
         <exclusion>
           <groupId>junit</groupId>

Modified: branches/enterprise/JBPAPP_5_0/build/excel.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/excel.pom.xml	2009-06-30 13:17:19 UTC (rev 11222)
+++ branches/enterprise/JBPAPP_5_0/build/excel.pom.xml	2009-06-30 13:20:51 UTC (rev 11223)
@@ -62,8 +62,9 @@
 		<dependency>
 	      <groupId>org.testng</groupId>
 	      <artifactId>testng</artifactId>
-	      <version>5.6</version>
-	      <optional>true</optional>
+	      <version>${version.testng}</version>
+	      <optional>true</optional>
+	      <classifier>jdk15</classifier>	      
 	      <exclusions>
 	        <exclusion>
 	          <groupId>junit</groupId>

Modified: branches/enterprise/JBPAPP_5_0/build/mail.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/mail.pom.xml	2009-06-30 13:17:19 UTC (rev 11222)
+++ branches/enterprise/JBPAPP_5_0/build/mail.pom.xml	2009-06-30 13:20:51 UTC (rev 11223)
@@ -68,8 +68,9 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>5.6</version>
+      <version>${version.testng}</version>
       <optional>true</optional>
+      <classifier>jdk15</classifier>      
       <exclusions>
         <exclusion>
           <groupId>junit</groupId>

Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml	2009-06-30 13:17:19 UTC (rev 11222)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml	2009-06-30 13:20:51 UTC (rev 11223)
@@ -34,12 +34,19 @@
       <name>JBoss Snapshot Repository</name>
       <url>http://snapshots.jboss.org/maven2</url>
     </repository> 
+<!--    <repository>      -->
+<!--      <id>maven_central</id>-->
+<!--      <name>Maven Central Repository</name>-->
+<!--      <url>http://repo1.maven.org/maven2</url>-->
+<!--    </repository>    -->
+    
   </repositories>
   
   <!-- Externalize some version numbers here -->
   <properties>
     <version.richfaces>3.3.1.GA</version.richfaces>
     <version.drools>5.0.1</version.drools>
+    <version.testng>5.8</version.testng>
   </properties>
 
   <dependencyManagement>
@@ -1218,7 +1225,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.4.3</version>
         </plugin>
         
         <plugin>

Modified: branches/enterprise/JBPAPP_5_0/build/ui.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/ui.pom.xml	2009-06-30 13:17:19 UTC (rev 11222)
+++ branches/enterprise/JBPAPP_5_0/build/ui.pom.xml	2009-06-30 13:20:51 UTC (rev 11223)
@@ -180,9 +180,9 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>5.1</version>
+      <version>${version.testng}</version>
       <scope>test</scope>
-      <classifier>jdk15</classifier>
+      <classifier>jdk15</classifier>      
       <exclusions>
         <exclusion>
        	  <groupId>junit</groupId>