[jboss-svn-commits] JBL Code SVN: r15780 - in labs/jbossbuild/maven-surefire-jboss/trunk: maven-surefire-plugin and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 11 18:59:49 EDT 2007
Author: pgier
Date: 2007-10-11 18:59:48 -0400 (Thu, 11 Oct 2007)
New Revision: 15780
Modified:
labs/jbossbuild/maven-surefire-jboss/trunk/
labs/jbossbuild/maven-surefire-jboss/trunk/maven-surefire-plugin/pom.xml
labs/jbossbuild/maven-surefire-jboss/trunk/maven-surefire-report-plugin/pom.xml
labs/jbossbuild/maven-surefire-jboss/trunk/pom.xml
labs/jbossbuild/maven-surefire-jboss/trunk/surefire-api/pom.xml
labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/pom.xml
labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxy.java
labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/pom.xml
labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-junit/pom.xml
labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-junit4/pom.xml
labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-testng/pom.xml
labs/jbossbuild/maven-surefire-jboss/trunk/surefire-site/pom.xml
Log:
Changing pom versions to reflect jboss fork. Fix for codehaus jira issue SUREFIRE-349
Property changes on: labs/jbossbuild/maven-surefire-jboss/trunk
___________________________________________________________________
Name: svn:ignore
- bin
.git
target
.classpath
.project
+ bin
.git
.gitignore
target
.classpath
.project
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/maven-surefire-plugin/pom.xml
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/maven-surefire-plugin/pom.xml 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/maven-surefire-plugin/pom.xml 2007-10-11 22:59:48 UTC (rev 15780)
@@ -22,7 +22,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-surefire-plugin</artifactId>
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/maven-surefire-report-plugin/pom.xml
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/maven-surefire-report-plugin/pom.xml 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/maven-surefire-report-plugin/pom.xml 2007-10-11 22:59:48 UTC (rev 15780)
@@ -22,7 +22,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-surefire-report-plugin</artifactId>
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/pom.xml
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/pom.xml 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/pom.xml 2007-10-11 22:59:48 UTC (rev 15780)
@@ -30,7 +30,7 @@
<artifactId>surefire</artifactId>
<packaging>pom</packaging>
<name>SureFire</name>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
<description>Surefire is a test framework project.</description>
<url>http://maven.apache.org/surefire</url>
<issueManagement>
@@ -81,12 +81,12 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-api</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-booter</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -115,6 +115,13 @@
</dependency>
</dependencies>
<build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
@@ -189,4 +196,19 @@
<url>http://snapshots.repository.codehaus.org</url>
</repository>
</repositories>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the distribution jar file to a local checkout of the maven repository
+ - This variable can be set in $MAVEN_HOME/conf/settings.xml -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
</project>
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/surefire-api/pom.xml
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/surefire-api/pom.xml 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/surefire-api/pom.xml 2007-10-11 22:59:48 UTC (rev 15780)
@@ -21,7 +21,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>surefire-api</artifactId>
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/pom.xml
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/pom.xml 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/pom.xml 2007-10-11 22:59:48 UTC (rev 15780)
@@ -2,7 +2,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>surefire-booter</artifactId>
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java 2007-10-11 22:59:48 UTC (rev 15780)
@@ -590,9 +590,19 @@
cli.createArgument().setFile( systemProperties );
}
+
StreamConsumer out = getForkingStreamConsumer( showHeading, showFooter, redirectTestOutputToFile );
- StreamConsumer err = getForkingStreamConsumer( showHeading, showFooter, redirectTestOutputToFile );
+ StreamConsumer err;
+
+ if ( redirectTestOutputToFile )
+ {
+ err = out;
+ }
+ else
+ {
+ err = getForkingStreamConsumer( showHeading, showFooter, redirectTestOutputToFile );
+ }
if ( forkConfiguration.isDebug() )
{
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxy.java
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxy.java 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxy.java 2007-10-11 22:59:48 UTC (rev 15780)
@@ -46,7 +46,9 @@
private File reportsDirectory;
private PrintWriter printWriter;
-
+
+ private StringBuffer outputBuffer = new StringBuffer();
+
/**
* Create a consumer that will write to a {@link File} for each test.
* Files will be saved in working directory.
@@ -127,6 +129,12 @@
{
throw new IllegalStateException( "testSetCompleted called before testSetStarting" );
}
+ if ( outputBuffer.length() > 0 )
+ {
+ getPrintWriter().write( outputBuffer.toString() );
+ getPrintWriter().write( LINE_SEPARATOR );
+ outputBuffer.setLength( 0 );
+ }
getPrintWriter().close();
setPrintWriter( null );
super.testSetCompleted();
@@ -139,8 +147,17 @@
{
if ( getPrintWriter() == null )
{
- throw new IllegalStateException( "consumeOutputLine called before testSetStarting" );
+ outputBuffer.append( line );
+ outputBuffer.append( LINE_SEPARATOR );
+ return;
}
+
+ if ( outputBuffer.length() > 0 )
+ {
+ getPrintWriter().write( outputBuffer.toString() );
+ getPrintWriter().write( LINE_SEPARATOR );
+ outputBuffer.setLength( 0 );
+ }
getPrintWriter().write( line );
getPrintWriter().write( LINE_SEPARATOR );
}
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/pom.xml
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/pom.xml 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/pom.xml 2007-10-11 22:59:48 UTC (rev 15780)
@@ -22,7 +22,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>surefire-providers</artifactId>
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-junit/pom.xml
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-junit/pom.xml 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-junit/pom.xml 2007-10-11 22:59:48 UTC (rev 15780)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-providers</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</parent>
<artifactId>surefire-junit</artifactId>
<name>SureFire JUnit Runner</name>
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-junit4/pom.xml
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-junit4/pom.xml 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-junit4/pom.xml 2007-10-11 22:59:48 UTC (rev 15780)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-providers</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</parent>
<artifactId>surefire-junit4</artifactId>
<name>SureFire JUnit4 Runner</name>
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-testng/pom.xml
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-testng/pom.xml 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/surefire-providers/surefire-testng/pom.xml 2007-10-11 22:59:48 UTC (rev 15780)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-providers</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</parent>
<artifactId>surefire-testng</artifactId>
<name>SureFire TestNG Runner</name>
Modified: labs/jbossbuild/maven-surefire-jboss/trunk/surefire-site/pom.xml
===================================================================
--- labs/jbossbuild/maven-surefire-jboss/trunk/surefire-site/pom.xml 2007-10-11 20:43:33 UTC (rev 15779)
+++ labs/jbossbuild/maven-surefire-jboss/trunk/surefire-site/pom.xml 2007-10-11 22:59:48 UTC (rev 15780)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</parent>
<artifactId>surefire-site</artifactId>
<name>Surefire</name>
More information about the jboss-svn-commits
mailing list