[jboss-cvs] JBossAS SVN: r67098 - in projects/microcontainer/trunk: build and 1 other directories.

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

Author: pgier
Date: 2007-11-14 16:26:14 -0500 (Wed, 14 Nov 2007)
New Revision: 67098

Modified:
   projects/microcontainer/trunk/aop-mc-int/pom.xml
   projects/microcontainer/trunk/build/pom.xml
   projects/microcontainer/trunk/kernel/pom.xml
Log:
Downgrading ant-junit because of an issue in aop-mc-int tests.
Setting surefire plugin to always redirect test output to a file to avoid lots of command line debug output.

Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml	2007-11-14 21:23:18 UTC (rev 67097)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml	2007-11-14 21:26:14 UTC (rev 67098)
@@ -381,13 +381,17 @@
       <build>
         <plugins>
           <plugin>
+			      <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
+			      <version>1.1</version>
             <executions>
               <execution>
                 <id>ant-tests-weave</id>
                 <phase>test</phase>
                 <configuration>
                   <tasks>
+                    <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+					          <echo message="plugin classpath:  ${plugin_classpath}"/>
                     <mkdir dir="${project.build.directory}/surefire-reports/ant-weave"/>
                     <property name="build.testlog" value="${project.build.directory}/log"/>
                     <mkdir dir="${build.testlog}"/>
@@ -432,10 +436,15 @@
             </executions> 
             <dependencies>
               <dependency>
-                <groupId>org.apache.ant</groupId>
+                <groupId>ant</groupId>
                 <artifactId>ant-junit</artifactId>
                 <version>${version.ant.junit}</version>
               </dependency>
+              <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${version.junit}</version>
+              </dependency>
             </dependencies>     
           </plugin>
           <plugin>
@@ -510,10 +519,15 @@
             </executions> 
             <dependencies>
               <dependency>
-                <groupId>org.apache.ant</groupId>
+                <groupId>ant</groupId>
                 <artifactId>ant-junit</artifactId>
                 <version>${version.ant.junit}</version>
               </dependency>
+              <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${version.junit}</version>
+              </dependency>
             </dependencies>     
           </plugin>
           <plugin>

Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml	2007-11-14 21:23:18 UTC (rev 67097)
+++ projects/microcontainer/trunk/build/pom.xml	2007-11-14 21:26:14 UTC (rev 67098)
@@ -45,7 +45,7 @@
     <version.org.jboss.test>1.0.4.GA</version.org.jboss.test>
     <version.junit>3.8.1</version.junit>
     <version.jboss.profiler.jvmti>1.0.0.CR5</version.jboss.profiler.jvmti>
-    <version.ant.junit>1.7.0</version.ant.junit>
+    <version.ant.junit>1.6.5</version.ant.junit>
     <version.apache-xerces.xml-apis>2.7.1</version.apache-xerces.xml-apis>
     <version.jboss.drools>4.0.1</version.jboss.drools>
     <version.jboss.jbpm>3.1.1</version.jboss.jbpm>
@@ -72,8 +72,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+		<version>2.3</version>
         <configuration>
           <testFailureIgnore>true</testFailureIgnore>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
           <includes>
             <include>org/jboss/test/**/*TestCase.java</include>
           </includes>
@@ -397,7 +399,7 @@
         <version>${version.jboss.classloading.spi}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.ant</groupId>
+        <groupId>ant</groupId>
         <artifactId>ant-junit</artifactId>
         <version>${version.ant.junit}</version>
       </dependency>

Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml	2007-11-14 21:23:18 UTC (rev 67097)
+++ projects/microcontainer/trunk/kernel/pom.xml	2007-11-14 21:26:14 UTC (rev 67098)
@@ -25,13 +25,6 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>