From surefire-commits-returncharlesabbott@example.net Tue Feb 05 21:41:44 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 65041 invoked from network); 5 Feb 2008 21:41:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 5 Feb 2008 21:41:44 -0000
Received: (qmail 83241 invoked by uid 500); 5 Feb 2008 21:41:36 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 83203 invoked by uid 500); 5 Feb 2008 21:41:36 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 83191 invoked by uid 99); 5 Feb 2008 21:41:35 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2008 13:41:35 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2008 21:41:28 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5E0411A9832; Tue,  5 Feb 2008 13:41:20 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r618784 -
 /maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
Date: Tue, 05 Feb 2008 21:41:19 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Tue Feb  5 13:41:14 2008
New Revision: 618784

URL: http://svn.apache.org/viewvc?rev=618784&view=rev
Log:
[SUREFIRE-445] Include Manifest-Version attribute, as required by spec

Modified:
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java?rev=618784&r1=618783&r2=618784&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java Tue Feb  5 13:41:14 2008
@@ -236,6 +236,7 @@
             cp += UrlUtils.getURL( new File( el ) ).toExternalForm() + " ";
         }
 
+        writer.writeValue("Manifest-Version", "1.0");
         writer.writeValue("Class-Path", cp.trim());
         writer.writeValue("Main-Class", SurefireBooter.class.getName());
 



From surefire-commits-returncharlesabbott@example.net Wed Feb 06 23:25:05 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 58782 invoked from network); 6 Feb 2008 23:25:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 6 Feb 2008 23:25:04 -0000
Received: (qmail 53385 invoked by uid 500); 6 Feb 2008 23:24:57 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 53354 invoked by uid 500); 6 Feb 2008 23:24:57 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 53343 invoked by uid 99); 6 Feb 2008 23:24:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2008 15:24:57 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2008 23:24:36 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9179F1A9832; Wed,  6 Feb 2008 15:24:37 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r619219 -
 /maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
Date: Wed, 06 Feb 2008 23:24:32 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Wed Feb  6 15:24:21 2008
New Revision: 619219

URL: http://svn.apache.org/viewvc?rev=619219&view=rev
Log:
Single class executor should start/stop suite so you get correct console reporting.  This begins to address SUREFIRE-446, but doesn't actually fix the bug (the result of this is you get an XML file with just one of the test results in it; the other test results are lost)

Modified:
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java?rev=619219&r1=619218&r2=619219&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java Wed Feb  6 15:24:21 2008
@@ -95,9 +95,13 @@
         {
             throw new TestSetFailedException( "Unable to find test set '" + testSetName + "' in suite" );
         }
+        
+        startTestSuite( reporterManager, this );
 
         TestNGExecutor.run( new Class[]{testSet.getTestClass()}, this.testSourceDirectory, this.options, this.version,
                             this.classifier, reporterManager, this, reportsDirectory );
+        
+        finishTestSuite( reporterManager, this );
     }
 
     public void execute( ReporterManager reporterManager, ClassLoader classLoader )



From surefire-commits-returncharlesabbott@example.net Thu Feb 07 00:43:32 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 89089 invoked from network); 7 Feb 2008 00:43:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 7 Feb 2008 00:43:32 -0000
Received: (qmail 26382 invoked by uid 500); 7 Feb 2008 00:43:25 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 26355 invoked by uid 500); 7 Feb 2008 00:43:25 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 26344 invoked by uid 99); 7 Feb 2008 00:43:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2008 16:43:25 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 00:43:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 921371A9832; Wed,  6 Feb 2008 16:43:09 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r619233 - in
 /maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report:
 SurefireReportMojo.java SurefireReportOnlyMojo.java
Date: Thu, 07 Feb 2008 00:43:09 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Wed Feb  6 16:43:07 2008
New Revision: 619233

URL: http://svn.apache.org/viewvc?rev=619233&view=rev
Log:
[SUREFIRE-449] Getting rid of @aggregator annotation, which seems to be broken in core 2.0.8 for reporting plugins (or something).  See bug comments for link to mailing list discussion.

Modified:
    maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
    maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java

Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java?rev=619233&r1=619232&r2=619233&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java Wed Feb  6 16:43:07 2008
@@ -42,7 +42,6 @@
  * @version $Id$
  * @goal report
  * @execute phase="test" lifecycle="surefire"
- * @aggregator
  */
 public class SurefireReportMojo
     extends AbstractMavenReport

Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java?rev=619233&r1=619232&r2=619233&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java Wed Feb  6 16:43:07 2008
@@ -28,7 +28,6 @@
  * @author <a href="mailto:charlesabbott@example.net">Barrie Treloar</a>
  * @goal report-only
  * @execute phase="validate" lifecycle="surefire"
- * @aggregator
  * @since 2.3
  */
 public class SurefireReportOnlyMojo



From surefire-commits-returncharlesabbott@example.net Fri Feb 08 02:00:34 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 66599 invoked from network); 8 Feb 2008 02:00:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 8 Feb 2008 02:00:33 -0000
Received: (qmail 20176 invoked by uid 500); 8 Feb 2008 02:00:26 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 20153 invoked by uid 500); 8 Feb 2008 02:00:26 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 20142 invoked by uid 99); 8 Feb 2008 02:00:26 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 18:00:26 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Feb 2008 02:00:18 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B88191A9832; Thu,  7 Feb 2008 18:00:10 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r619732 - in /maven/surefire/trunk/surefire-booter/src:
 main/java/org/apache/maven/surefire/booter/
 test/java/org/apache/maven/surefire/booter/
Date: Fri, 08 Feb 2008 02:00:10 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Thu Feb  7 18:00:09 2008
New Revision: 619732

URL: http://svn.apache.org/viewvc?rev=619732&view=rev
Log:
[SUREFIRE-451] Eliminate home-grown manifest writer; just use JarOutputStream and java.util.jar.Manifest.  Based on a patch submitted by Joerg Lauer.  His patch modified MJW; this check-in deletes the old class (and its test) entirely.

Removed:
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ManifestJarWriter.java
    maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ManifestJarWriterTest.java
Modified:
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java?rev=619732&r1=619731&r2=619732&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java Thu Feb  7 18:00:09 2008
@@ -24,12 +24,16 @@
 import org.codehaus.plexus.util.cli.Commandline;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
 
 /**
  * Configuration for forking tests.
@@ -224,7 +228,13 @@
         if ( !debug ) {
             file.deleteOnExit();
         }
-        ManifestJarWriter writer = new ManifestJarWriter(file);
+        FileOutputStream fos = new FileOutputStream( file );
+        JarOutputStream jos = new JarOutputStream( fos );
+        jos.setLevel( JarOutputStream.STORED );
+        JarEntry je = new JarEntry( "META-INF/MANIFEST.MF" );
+        jos.putNextEntry( je );
+
+        Manifest man = new Manifest();
 
         // we can't use StringUtils.join here since we need to add a '/' to
         // the end of directory entries - otherwise the jvm will ignore them.
@@ -236,11 +246,12 @@
             cp += UrlUtils.getURL( new File( el ) ).toExternalForm() + " ";
         }
 
-        writer.writeValue("Manifest-Version", "1.0");
-        writer.writeValue("Class-Path", cp.trim());
-        writer.writeValue("Main-Class", SurefireBooter.class.getName());
+        man.getMainAttributes().putValue("Manifest-Version", "1.0");
+        man.getMainAttributes().putValue("Class-Path", cp.trim());
+        man.getMainAttributes().putValue("Main-Class", SurefireBooter.class.getName());
 
-        writer.close();
+        man.write(jos);
+        jos.close();
 
         return file;
     }



From surefire-commits-returncharlesabbott@example.net Fri Feb 08 05:06:31 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 25519 invoked from network); 8 Feb 2008 05:06:31 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 8 Feb 2008 05:06:31 -0000
Received: (qmail 43586 invoked by uid 500); 8 Feb 2008 05:06:24 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 43551 invoked by uid 500); 8 Feb 2008 05:06:24 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 43540 invoked by uid 99); 8 Feb 2008 05:06:24 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 21:06:24 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Feb 2008 05:06:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A492B1A9832; Thu,  7 Feb 2008 21:06:07 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r619769 - in /maven/surefire/trunk: ./ maven-surefire-plugin/
 maven-surefire-report-plugin/ surefire-api/ surefire-booter/
 surefire-integration-tests/ surefire-providers/
 surefire-providers/surefire-junit/ surefire-providers/surefire-junit4...
Date: Fri, 08 Feb 2008 05:06:06 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Thu Feb  7 21:06:05 2008
New Revision: 619769

URL: http://svn.apache.org/viewvc?rev=619769&view=rev
Log:
Preparing for 2.4.2 release; let's start with a snapshot

Modified:
    maven/surefire/trunk/maven-surefire-plugin/pom.xml
    maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
    maven/surefire/trunk/pom.xml
    maven/surefire/trunk/surefire-api/pom.xml
    maven/surefire/trunk/surefire-booter/pom.xml
    maven/surefire/trunk/surefire-integration-tests/pom.xml
    maven/surefire/trunk/surefire-providers/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml

Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=619769&r1=619768&r2=619769&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Thu Feb  7 21:06:05 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-surefire-plugin</artifactId>

Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=619769&r1=619768&r2=619769&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Thu Feb  7 21:06:05 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-surefire-report-plugin</artifactId>

Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=619769&r1=619768&r2=619769&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Thu Feb  7 21:06:05 2008
@@ -29,7 +29,7 @@
   <artifactId>surefire</artifactId>
   <packaging>pom</packaging>
   <name>SureFire</name>
-  <version>2.5-SNAPSHOT</version>
+  <version>2.4.2-SNAPSHOT</version>
   <description>Surefire is a test framework project.</description>
   <url>http://maven.apache.org/surefire</url>
   <issueManagement>
@@ -80,12 +80,12 @@
       <dependency>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire-api</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.4.2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire-booter</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.4.2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>

Modified: maven/surefire/trunk/surefire-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=619769&r1=619768&r2=619769&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/pom.xml (original)
+++ maven/surefire/trunk/surefire-api/pom.xml Thu Feb  7 21:06:05 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>surefire-api</artifactId>

Modified: maven/surefire/trunk/surefire-booter/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?rev=619769&r1=619768&r2=619769&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/pom.xml (original)
+++ maven/surefire/trunk/surefire-booter/pom.xml Thu Feb  7 21:06:05 2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>surefire-booter</artifactId>

Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=619769&r1=619768&r2=619769&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Thu Feb  7 21:06:05 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion> 
   <groupId>org.apache.maven.surefire</groupId>

Modified: maven/surefire/trunk/surefire-providers/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/pom.xml?rev=619769&r1=619768&r2=619769&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/pom.xml Thu Feb  7 21:06:05 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>surefire-providers</artifactId>

Modified: maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml?rev=619769&r1=619768&r2=619769&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml Thu Feb  7 21:06:05 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>surefire-junit</artifactId>
   <name>SureFire JUnit Runner</name>

Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?rev=619769&r1=619768&r2=619769&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Thu Feb  7 21:06:05 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>surefire-junit4</artifactId>
   <name>SureFire JUnit4 Runner</name>

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?rev=619769&r1=619768&r2=619769&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Thu Feb  7 21:06:05 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>surefire-testng</artifactId>
   <name>SureFire TestNG Runner</name>



From surefire-commits-returncharlesabbott@example.net Mon Feb 11 22:56:32 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 68922 invoked from network); 11 Feb 2008 22:56:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 11 Feb 2008 22:56:32 -0000
Received: (qmail 78559 invoked by uid 500); 11 Feb 2008 22:56:26 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 78537 invoked by uid 500); 11 Feb 2008 22:56:26 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 78526 invoked by uid 99); 11 Feb 2008 22:56:26 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Feb 2008 14:56:26 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Feb 2008 22:55:48 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 787EF1A983A; Mon, 11 Feb 2008 14:56:08 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r620660 - in /maven/surefire/trunk:
 surefire-api/src/main/java/org/apache/maven/surefire/report/
 surefire-api/src/main/java/org/apache/maven/surefire/util/
 surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/
Date: Mon, 11 Feb 2008 22:56:08 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Mon Feb 11 14:56:07 2008
New Revision: 620660

URL: http://svn.apache.org/viewvc?rev=620660&view=rev
Log:
[SUREFIRE-455] XML delimiter characters in attribute and text content are escaped twice.  I also added a test case and tweaked this patch to deliberately introduce SUREFIRE-456 to handle null characters.
Submitted by: Todor Todorov
Reviewed by: Dan Fabulich

Modified:
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java?rev=620660&r1=620659&r2=620660&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java Mon Feb 11 14:56:07 2008
@@ -218,9 +218,9 @@
 
             String message = t.getMessage();
 
-            if ( message != null && message.trim().length() > 0 )
+            if ( message != null )
             {
-                element.setAttribute( "message", escapeAttribute( message ) );
+                element.setAttribute( "message", message );
 
                 element.setAttribute( "type", ( stackTrace.indexOf( ":" ) > -1 ? stackTrace.substring( 0,
                                                                                                        stackTrace.indexOf(
@@ -235,7 +235,7 @@
 
         if (stackTrace != null)
         {
-            element.setValue( escapeAttribute(stackTrace) );
+            element.setValue( stackTrace );
         }
 
         addOutputStreamElement( stdOut, "system-out", testCase );
@@ -292,35 +292,10 @@
 
                 property.setAttribute( "name", key );
 
-                property.setAttribute( "value", escapeAttribute( value ) );
+                property.setAttribute( "value", value );
 
             }
         }
-    }
-
-    private static String escapeAttribute( String attribute )
-    {
-        // Shouldn't Xpp3Dom do this itself?
-        StringBuffer sb = new StringBuffer ( attribute.length() * 2 );
-        for (int i = 0; i < attribute.length(); i++ ) {
-            char c = attribute.charAt( i );
-            if ( c < 32 ) {
-                if ( c == '\n' || c == '\r' || c == '\t') {
-                    sb.append( c );
-                } else {
-                    sb.append( "&#" ).append( (int) c).append( ';' );
-                }
-            } else if ( c == '<') {
-                sb.append( "&lt;" );
-            } else if ( c == '>') {
-                sb.append( "&gt;" );
-            }
-            else {
-                sb.append( c );
-            }
-        }
-        return sb.toString();
-
     }
 
     public Iterator getResults()

Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java?rev=620660&r1=620659&r2=620660&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java (original)
+++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java Mon Feb 11 14:56:07 2008
@@ -147,13 +147,35 @@
 
     private static String escapeXml( String text )
     {
-        text = StringUtils.replace( text, "&", "&amp;" );
-        text = StringUtils.replace( text, "<", "&amp;" );
-        text = StringUtils.replace( text, ">", "&amp;" );
-        text = StringUtils.replace( text, "\"", "&quot;" );
-        text = StringUtils.replace( text, "\'", "&apos;" );
-
-        return text;
+        StringBuffer sb = new StringBuffer ( text.length() * 2 );
+        for (int i = 0; i < text.length(); i++ ) {
+            char c = text.charAt( i );
+            if ( c < 32 ) {
+                if ( c == '\n' || c == '\r' || c == '\t') {
+                    sb.append( c );
+                } else {
+                    // uh-oh!  This character is illegal in XML 1.0!
+                    // http://www.w3.org/TR/1998/REC-xml-19980210#charsets
+                    // we're going to deliberately doubly-XML escape it...
+                    // there's nothing better we can do! :-(
+                    // SUREFIRE-456
+                    sb.append( "&amp;#" ).append( (int) c).append( ';' );
+                }
+            } else if ( c == '<') {
+                sb.append( "&lt;" );
+            } else if ( c == '>') {
+                sb.append( "&gt;" );
+            } else if (c == '&') {
+                sb.append("&amp;");
+            } else if (c == '"') {
+                sb.append("&quot;");
+            } else if (c == '\'') {
+                sb.append("&apos;");
+            } else {
+                sb.append( c );
+            }
+        }
+        return sb.toString();
     }
 
     public void addAttribute( String key, String value )

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java?rev=620660&r1=620659&r2=620660&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java Mon Feb 11 14:56:07 2008
@@ -4,8 +4,11 @@
 import junit.framework.TestCase;
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.plugins.surefire.report.ReportTestCase;
+import org.apache.maven.plugins.surefire.report.ReportTestSuite;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * Test Surefire-224 (XML test reports are not well-formed when failure message contains quotes)
@@ -29,5 +32,22 @@
         
         HelperAssertions.assertTestSuiteResults( 4, 0, 4, 0, testDir );
         
+        ReportTestSuite suite = (ReportTestSuite) HelperAssertions.extractReports( (new File[] { testDir }) ).get( 0 );
+        List testCases = suite.getTestCases();
+        assertEquals( "Wrong number of test case objects", 4, testCases.size() );
+        ReportTestCase current, testQuote = null, testLower = null, testGreater = null, testU0000 = null;
+        for ( int i = 0; i < testCases.size(); i++ )
+        {
+            current = (ReportTestCase) testCases.get( i );
+            if ( "testQuote".equals( current.getName() ) ) testQuote = current;
+            else if ( "testLower".equals( current.getName() ) ) testLower = current;
+            else if ( "testGreater".equals( current.getName() ) ) testGreater = current;
+            else if ( "testU0000".equals( current.getName() ) ) testU0000 = current;
+        }
+        assertEquals("Wrong error message", "\"", testQuote.getFailure().get( "message" ) );
+        assertEquals("Wrong error message", "<", testLower.getFailure().get( "message" ) );
+        assertEquals("Wrong error message", ">", testGreater.getFailure().get( "message" ) );
+        // SUREFIRE-456 we have to doubly-escape non-visible control characters like \u0000
+        assertEquals("Wrong error message", "&#0;", testU0000.getFailure().get( "message" ) );
     }
 }



From surefire-commits-returncharlesabbott@example.net Mon Feb 11 23:24:46 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 77512 invoked from network); 11 Feb 2008 23:24:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 11 Feb 2008 23:24:46 -0000
Received: (qmail 21127 invoked by uid 500); 11 Feb 2008 23:24:40 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 21098 invoked by uid 500); 11 Feb 2008 23:24:40 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 21087 invoked by uid 99); 11 Feb 2008 23:24:40 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Feb 2008 15:24:40 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Feb 2008 23:24:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 829821A9832; Mon, 11 Feb 2008 15:24:25 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r620666 -
 /maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java
Date: Mon, 11 Feb 2008 23:24:24 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Mon Feb 11 15:24:22 2008
New Revision: 620666

URL: http://svn.apache.org/viewvc?rev=620666&view=rev
Log:
Don't dump output files in USER_DIR; put them in the target directory instead.

Modified:
    maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java

Modified: maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java?rev=620666&r1=620665&r2=620666&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java (original)
+++ maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java Mon Feb 11 15:24:22 2008
@@ -38,18 +38,22 @@
 {
 
     private static final String USER_DIR = System.getProperty( "user.dir" );
+    File targetDir;
 
     protected void setUp()
         throws Exception
     {
         super.setUp();
-        setOutputConsumer( new FileOutputConsumerProxy( (OutputConsumer) getOutputConsumerMock().proxy() ) );
+        targetDir = new File ( USER_DIR, "target" );
+        if ( !targetDir.exists() ) targetDir = new File( USER_DIR );
+        setOutputConsumer( new FileOutputConsumerProxy( (OutputConsumer) getOutputConsumerMock().proxy(), targetDir ) );
     }
 
     public void testConsumeOutputLine()
         throws Exception
     {
-        File reportFile = new File( USER_DIR, getReportEntry().getName() + "-output.txt" );
+        
+        File reportFile = new File( targetDir, getReportEntry().getName() + "-output.txt" );
         reportFile.delete();
 
         getOutputConsumerMock().expects( new InvokeOnceMatcher() ).method( "testSetStarting" )



From surefire-commits-returncharlesabbott@example.net Fri Feb 15 22:28:59 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 89956 invoked from network); 15 Feb 2008 22:28:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 15 Feb 2008 22:28:58 -0000
Received: (qmail 26119 invoked by uid 500); 15 Feb 2008 22:28:53 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 26092 invoked by uid 500); 15 Feb 2008 22:28:53 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 26081 invoked by uid 99); 15 Feb 2008 22:28:53 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2008 14:28:52 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2008 22:28:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2D6131A9832; Fri, 15 Feb 2008 14:28:35 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r628192 - in
 /maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng:
 TestNGDirectoryTestSuite.java TestNGXmlTestSuite.java
Date: Fri, 15 Feb 2008 22:28:34 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Fri Feb 15 14:28:34 2008
New Revision: 628192

URL: http://svn.apache.org/viewvc?rev=628192&view=rev
Log:
[SUREFIRE-452] Allow the user to override the name "TestSuite" in plugin configuration.  I modified this patch to make it work with XML suites as well.
Submitted by: Erez Nahir
Reviewed by: Dan Fabulich

Modified:
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
    maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java?rev=628192&r1=628191&r2=628192&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java Fri Feb 15 14:28:34 2008
@@ -74,6 +74,7 @@
         this.version = artifactVersion;
         
         this.classifier = artifactClassifier;
+
     }
 
     protected SurefireTestSet createTestSet( Class testClass, ClassLoader classLoader )
@@ -161,8 +162,8 @@
     public static void startTestSuite( ReporterManager reporterManager, Object suite )
     {
         String rawString = bundle.getString( "testSetStarting" );
-
-        ReportEntry report = new ReportEntry( suite.getClass().getName(), "TestSuite", rawString );
+        
+        ReportEntry report = new ReportEntry( suite.getClass().getName(), getSuiteName(suite), rawString );
 
         try
         {
@@ -179,10 +180,32 @@
         String rawString = bundle.getString( "testSetCompletedNormally" );
 
         ReportEntry report =
-            new ReportEntry( suite.getClass().getName(), "TestSuite", rawString );
+            new ReportEntry( suite.getClass().getName(), getSuiteName(suite), rawString );
 
         reporterManager.testSetCompleted( report );
 
         reporterManager.reset();
     }
+    
+    public String getSuiteName() {
+        String result = (String) options.get("suitename");
+        if (result == null) {
+            result = "TestSuite";
+        }
+        return result;
+    }
+
+    private static String getSuiteName(Object suite)
+    {
+        String result;
+        if (suite instanceof TestNGDirectoryTestSuite) {
+            return ((TestNGDirectoryTestSuite) suite).getSuiteName();
+        } else if (suite instanceof TestNGXmlTestSuite) {
+            return ((TestNGXmlTestSuite) suite).getSuiteName();
+        }else {
+            result = "TestSuite";
+        }
+
+        return result;
+    }    
 }

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java?rev=628192&r1=628191&r2=628192&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java Fri Feb 15 14:28:34 2008
@@ -134,4 +134,12 @@
 
         return this.testSets;
     }
+    
+    public String getSuiteName() {
+        String result = (String) options.get("suitename");
+        if (result == null) {
+            result = "TestSuite";
+        }
+        return result;
+    }
 }



From surefire-commits-returncharlesabbott@example.net Fri Feb 15 23:09:36 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 2826 invoked from network); 15 Feb 2008 23:09:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 15 Feb 2008 23:09:34 -0000
Received: (qmail 76180 invoked by uid 500); 15 Feb 2008 23:09:26 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 76157 invoked by uid 500); 15 Feb 2008 23:09:26 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 76136 invoked by uid 99); 15 Feb 2008 23:09:26 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2008 15:09:26 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2008 23:09:02 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 3A3BD1A9832; Fri, 15 Feb 2008 15:09:11 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r628198 - in /maven/surefire/trunk: ./ maven-surefire-plugin/
 maven-surefire-report-plugin/ surefire-api/ surefire-booter/
 surefire-integration-tests/ surefire-providers/
 surefire-providers/surefire-junit/ surefire-providers/surefire-junit4...
Date: Fri, 15 Feb 2008 23:09:10 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Fri Feb 15 15:09:09 2008
New Revision: 628198

URL: http://svn.apache.org/viewvc?rev=628198&view=rev
Log:
[maven-release-plugin] prepare release surefire-2.4.2

Modified:
    maven/surefire/trunk/maven-surefire-plugin/pom.xml
    maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
    maven/surefire/trunk/pom.xml
    maven/surefire/trunk/surefire-api/pom.xml
    maven/surefire/trunk/surefire-booter/pom.xml
    maven/surefire/trunk/surefire-integration-tests/pom.xml
    maven/surefire/trunk/surefire-providers/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml

Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=628198&r1=628197&r2=628198&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Fri Feb 15 15:09:09 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-surefire-plugin</artifactId>

Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=628198&r1=628197&r2=628198&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Fri Feb 15 15:09:09 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-surefire-report-plugin</artifactId>

Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=628198&r1=628197&r2=628198&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Fri Feb 15 15:09:09 2008
@@ -29,7 +29,7 @@
   <artifactId>surefire</artifactId>
   <packaging>pom</packaging>
   <name>SureFire</name>
-  <version>2.4.2-SNAPSHOT</version>
+  <version>2.4.2</version>
   <description>Surefire is a test framework project.</description>
   <url>http://maven.apache.org/surefire</url>
   <issueManagement>
@@ -71,21 +71,21 @@
     </contributor>
   </contributors>
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/surefire/trunk/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/surefire/trunk/</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/surefire/trunk</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4.2</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4.2</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/surefire/tags/surefire-2.4.2</url>
   </scm>
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire-api</artifactId>
-        <version>2.4.2-SNAPSHOT</version>
+        <version>2.4.2</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire-booter</artifactId>
-        <version>2.4.2-SNAPSHOT</version>
+        <version>2.4.2</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>

Modified: maven/surefire/trunk/surefire-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=628198&r1=628197&r2=628198&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/pom.xml (original)
+++ maven/surefire/trunk/surefire-api/pom.xml Fri Feb 15 15:09:09 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>surefire-api</artifactId>

Modified: maven/surefire/trunk/surefire-booter/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?rev=628198&r1=628197&r2=628198&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/pom.xml (original)
+++ maven/surefire/trunk/surefire-booter/pom.xml Fri Feb 15 15:09:09 2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>surefire-booter</artifactId>

Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=628198&r1=628197&r2=628198&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Fri Feb 15 15:09:09 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion> 
   <groupId>org.apache.maven.surefire</groupId>

Modified: maven/surefire/trunk/surefire-providers/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/pom.xml?rev=628198&r1=628197&r2=628198&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/pom.xml Fri Feb 15 15:09:09 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>surefire-providers</artifactId>

Modified: maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml?rev=628198&r1=628197&r2=628198&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml Fri Feb 15 15:09:09 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.2</version>
   </parent>
   <artifactId>surefire-junit</artifactId>
   <name>SureFire JUnit Runner</name>

Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?rev=628198&r1=628197&r2=628198&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Fri Feb 15 15:09:09 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.2</version>
   </parent>
   <artifactId>surefire-junit4</artifactId>
   <name>SureFire JUnit4 Runner</name>

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?rev=628198&r1=628197&r2=628198&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Fri Feb 15 15:09:09 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.2</version>
   </parent>
   <artifactId>surefire-testng</artifactId>
   <name>SureFire TestNG Runner</name>



From surefire-commits-returncharlesabbott@example.net Fri Feb 15 23:09:37 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 3003 invoked from network); 15 Feb 2008 23:09:36 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 15 Feb 2008 23:09:36 -0000
Received: (qmail 76733 invoked by uid 500); 15 Feb 2008 23:09:31 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 76714 invoked by uid 500); 15 Feb 2008 23:09:31 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 76703 invoked by uid 99); 15 Feb 2008 23:09:31 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2008 15:09:31 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2008 23:09:07 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5D3AD1A983A; Fri, 15 Feb 2008 15:09:16 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r628199 - in /maven/surefire/tags/surefire-2.4.2: ./
 maven-surefire-plugin/ maven-surefire-report-plugin/ surefire-api/
 surefire-booter/ surefire-integration-tests/ surefire-providers/
 surefire-providers/surefire-junit/ surefire-providers/s...
Date: Fri, 15 Feb 2008 23:09:16 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Fri Feb 15 15:09:15 2008
New Revision: 628199

URL: http://svn.apache.org/viewvc?rev=628199&view=rev
Log:
[maven-release-plugin]  copy for tag surefire-2.4.2

Added:
    maven/surefire/tags/surefire-2.4.2/
      - copied from r628176, maven/surefire/trunk/
    maven/surefire/tags/surefire-2.4.2/maven-surefire-plugin/pom.xml
      - copied unchanged from r628198, maven/surefire/trunk/maven-surefire-plugin/pom.xml
    maven/surefire/tags/surefire-2.4.2/maven-surefire-report-plugin/pom.xml
      - copied unchanged from r628198, maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
    maven/surefire/tags/surefire-2.4.2/pom.xml
      - copied unchanged from r628198, maven/surefire/trunk/pom.xml
    maven/surefire/tags/surefire-2.4.2/surefire-api/pom.xml
      - copied unchanged from r628198, maven/surefire/trunk/surefire-api/pom.xml
    maven/surefire/tags/surefire-2.4.2/surefire-booter/pom.xml
      - copied unchanged from r628198, maven/surefire/trunk/surefire-booter/pom.xml
    maven/surefire/tags/surefire-2.4.2/surefire-integration-tests/pom.xml
      - copied unchanged from r628198, maven/surefire/trunk/surefire-integration-tests/pom.xml
    maven/surefire/tags/surefire-2.4.2/surefire-providers/pom.xml
      - copied unchanged from r628198, maven/surefire/trunk/surefire-providers/pom.xml
    maven/surefire/tags/surefire-2.4.2/surefire-providers/surefire-junit/pom.xml
      - copied unchanged from r628198, maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
    maven/surefire/tags/surefire-2.4.2/surefire-providers/surefire-junit4/pom.xml
      - copied unchanged from r628198, maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
    maven/surefire/tags/surefire-2.4.2/surefire-providers/surefire-testng/pom.xml
      - copied unchanged from r628198, maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
    maven/surefire/tags/surefire-2.4.2/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
      - copied unchanged from r628192, maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
    maven/surefire/tags/surefire-2.4.2/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
      - copied unchanged from r628192, maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java


From surefire-commits-returncharlesabbott@example.net Fri Feb 15 23:09:47 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 3058 invoked from network); 15 Feb 2008 23:09:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 15 Feb 2008 23:09:47 -0000
Received: (qmail 76809 invoked by uid 500); 15 Feb 2008 23:09:41 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 76789 invoked by uid 500); 15 Feb 2008 23:09:41 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 76778 invoked by uid 99); 15 Feb 2008 23:09:41 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2008 15:09:41 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2008 23:09:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4024D1A9842; Fri, 15 Feb 2008 15:09:23 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r628200 - in /maven/surefire/trunk: ./ maven-surefire-plugin/
 maven-surefire-report-plugin/ surefire-api/ surefire-booter/
 surefire-integration-tests/ surefire-providers/
 surefire-providers/surefire-junit/ surefire-providers/surefire-junit4...
Date: Fri, 15 Feb 2008 23:09:22 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dfabulich
Date: Fri Feb 15 15:09:21 2008
New Revision: 628200

URL: http://svn.apache.org/viewvc?rev=628200&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
    maven/surefire/trunk/maven-surefire-plugin/pom.xml
    maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
    maven/surefire/trunk/pom.xml
    maven/surefire/trunk/surefire-api/pom.xml
    maven/surefire/trunk/surefire-booter/pom.xml
    maven/surefire/trunk/surefire-integration-tests/pom.xml
    maven/surefire/trunk/surefire-providers/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml

Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=628200&r1=628199&r2=628200&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Fri Feb 15 15:09:21 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-surefire-plugin</artifactId>

Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=628200&r1=628199&r2=628200&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Fri Feb 15 15:09:21 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-surefire-report-plugin</artifactId>

Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=628200&r1=628199&r2=628200&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Fri Feb 15 15:09:21 2008
@@ -29,7 +29,7 @@
   <artifactId>surefire</artifactId>
   <packaging>pom</packaging>
   <name>SureFire</name>
-  <version>2.4.2</version>
+  <version>2.5-SNAPSHOT</version>
   <description>Surefire is a test framework project.</description>
   <url>http://maven.apache.org/surefire</url>
   <issueManagement>
@@ -71,21 +71,21 @@
     </contributor>
   </contributors>
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4.2</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4.2</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/surefire/tags/surefire-2.4.2</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/surefire/trunk/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/surefire/trunk/</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/surefire/trunk</url>
   </scm>
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire-api</artifactId>
-        <version>2.4.2</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire-booter</artifactId>
-        <version>2.4.2</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>

Modified: maven/surefire/trunk/surefire-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=628200&r1=628199&r2=628200&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/pom.xml (original)
+++ maven/surefire/trunk/surefire-api/pom.xml Fri Feb 15 15:09:21 2008
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>surefire-api</artifactId>

Modified: maven/surefire/trunk/surefire-booter/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?rev=628200&r1=628199&r2=628200&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/pom.xml (original)
+++ maven/surefire/trunk/surefire-booter/pom.xml Fri Feb 15 15:09:21 2008
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>surefire-booter</artifactId>

Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=628200&r1=628199&r2=628200&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Fri Feb 15 15:09:21 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion> 
   <groupId>org.apache.maven.surefire</groupId>

Modified: maven/surefire/trunk/surefire-providers/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/pom.xml?rev=628200&r1=628199&r2=628200&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/pom.xml Fri Feb 15 15:09:21 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
-    <version>2.4.2</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>surefire-providers</artifactId>

Modified: maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml?rev=628200&r1=628199&r2=628200&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml Fri Feb 15 15:09:21 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.4.2</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <artifactId>surefire-junit</artifactId>
   <name>SureFire JUnit Runner</name>

Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?rev=628200&r1=628199&r2=628200&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Fri Feb 15 15:09:21 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.4.2</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <artifactId>surefire-junit4</artifactId>
   <name>SureFire JUnit4 Runner</name>

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?rev=628200&r1=628199&r2=628200&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Fri Feb 15 15:09:21 2008
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.4.2</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <artifactId>surefire-testng</artifactId>
   <name>SureFire TestNG Runner</name>



From surefire-commits-returncharlesabbott@example.net Sun Feb 24 00:27:35 2008
Return-Path: <surefire-commits-returncharlesabbott@example.net>
Delivered-To: charlesabbott@example.net
Received: (qmail 9437 invoked from network); 24 Feb 2008 00:27:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 24 Feb 2008 00:27:35 -0000
Received: (qmail 17560 invoked by uid 500); 24 Feb 2008 00:27:30 -0000
Delivered-To: charlesabbott@example.net
Received: (qmail 17540 invoked by uid 500); 24 Feb 2008 00:27:30 -0000
Mailing-List: contact charlesabbott@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:charlesabbott@example.net>
List-Unsubscribe: <mailto:charlesabbott@example.net>
List-Post: <mailto:charlesabbott@example.net>
List-Id: <surefire-commits.maven.apache.org>
Reply-To: charlesabbott@example.net
Delivered-To: mailing list charlesabbott@example.net
Received: (qmail 17529 invoked by uid 99); 24 Feb 2008 00:27:30 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Feb 2008 16:27:30 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Feb 2008 00:26:51 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id F0A781A9832; Sat, 23 Feb 2008 16:27:11 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r630554 - in /maven/surefire/trunk:
 maven-surefire-plugin/pom.xml maven-surefire-report-plugin/pom.xml
Date: Sun, 24 Feb 2008 00:27:11 -0000
To: charlesabbott@example.net
From: charlesabbott@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <charlesabbott@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: wsmoak
Date: Sat Feb 23 16:27:09 2008
New Revision: 630554

URL: http://svn.apache.org/viewvc?rev=630554&view=rev
Log:
Configure the site plugin staging url.

Modified:
    maven/surefire/trunk/maven-surefire-plugin/pom.xml
    maven/surefire/trunk/maven-surefire-report-plugin/pom.xml

Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=630554&r1=630553&r2=630554&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Sat Feb 23 16:27:09 2008
@@ -116,6 +116,17 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugins/${artifactId}-${version}</stagingSiteURL>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 -->
     <profile>

Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=630554&r1=630553&r2=630554&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Sat Feb 23 16:27:09 2008
@@ -58,6 +58,17 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugins/${artifactId}-${version}</stagingSiteURL>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 -->
     <profile>




{'source': 'Apache Software Foundation Public Mail Archives'}