[seam-commits] Seam SVN: r11255 - branches/community/Seam_2_2/build.

[seam-commits at lists.jboss.org]

Author: christian.bauer at jboss.com
Date: 2009-07-08 07:32:12 -0400 (Wed, 08 Jul 2009)
New Revision: 11255

Modified:
   branches/community/Seam_2_2/build/core.pom.xml
   branches/community/Seam_2_2/build/excel.pom.xml
   branches/community/Seam_2_2/build/mail.pom.xml
   branches/community/Seam_2_2/build/resteasy.pom.xml
   branches/community/Seam_2_2/build/root.pom.xml
   branches/community/Seam_2_2/build/ui.pom.xml
Log:
JBSEAM-4291, Upgraded TestNG to 5.9

Modified: branches/community/Seam_2_2/build/core.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/core.pom.xml	2009-07-08 10:38:49 UTC (rev 11254)
+++ branches/community/Seam_2_2/build/core.pom.xml	2009-07-08 11:32:12 UTC (rev 11255)
@@ -287,12 +287,10 @@
 		<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>
       <exclusions>
         <exclusion>

Modified: branches/community/Seam_2_2/build/excel.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/excel.pom.xml	2009-07-08 10:38:49 UTC (rev 11254)
+++ branches/community/Seam_2_2/build/excel.pom.xml	2009-07-08 11:32:12 UTC (rev 11255)
@@ -58,18 +58,18 @@
 			<artifactId>el-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
-		<dependency>
-	      <groupId>org.testng</groupId>
-	      <artifactId>testng</artifactId>
-	      <version>5.6</version>
-	      <optional>true</optional>
-	      <exclusions>
-	        <exclusion>
-	          <groupId>junit</groupId>
-	          <artifactId>junit</artifactId>
-	        </exclusion>
-	      </exclusions>
+
+		<dependency>
+	      <groupId>org.testng</groupId>
+	      <artifactId>testng</artifactId>
+	      <version>${version.testng}</version>
+	      <optional>true</optional>
+	      <exclusions>
+	        <exclusion>
+	          <groupId>junit</groupId>
+	          <artifactId>junit</artifactId>
+	        </exclusion>
+	      </exclusions>
 	    </dependency>
 	</dependencies>
 

Modified: branches/community/Seam_2_2/build/mail.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/mail.pom.xml	2009-07-08 10:38:49 UTC (rev 11254)
+++ branches/community/Seam_2_2/build/mail.pom.xml	2009-07-08 11:32:12 UTC (rev 11255)
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>5.6</version>
+      <version>${version.testng}</version>
       <optional>true</optional>
       <exclusions>
         <exclusion>

Modified: branches/community/Seam_2_2/build/resteasy.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/resteasy.pom.xml	2009-07-08 10:38:49 UTC (rev 11254)
+++ branches/community/Seam_2_2/build/resteasy.pom.xml	2009-07-08 11:32:12 UTC (rev 11255)
@@ -64,7 +64,7 @@
        <dependency>
          <groupId>org.testng</groupId>
          <artifactId>testng</artifactId>
-         <version>5.6</version>
+         <version>${version.testng}</version>
          <optional>true</optional>
          <exclusions>
            <exclusion>

Modified: branches/community/Seam_2_2/build/root.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/root.pom.xml	2009-07-08 10:38:49 UTC (rev 11254)
+++ branches/community/Seam_2_2/build/root.pom.xml	2009-07-08 11:32:12 UTC (rev 11255)
@@ -41,6 +41,7 @@
     <version.richfaces>3.3.1.GA</version.richfaces>
     <version.wicket>1.3.5.jboss1</version.wicket>
     <version.drools>5.0.1</version.drools>
+    <version.testng>5.9</version.testng>
   </properties>
 
   <dependencyManagement>
@@ -1370,7 +1371,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/community/Seam_2_2/build/ui.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/ui.pom.xml	2009-07-08 10:38:49 UTC (rev 11254)
+++ branches/community/Seam_2_2/build/ui.pom.xml	2009-07-08 11:32:12 UTC (rev 11255)
@@ -185,9 +185,8 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>5.1</version>
+      <version>${version.testng}</version>
       <scope>test</scope>
-      <classifier>jdk15</classifier>
       <exclusions>
         <exclusion>
        	  <groupId>junit</groupId>