svn commit: r1417810 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml

2012-12-06 Thread olamy 
Author: olamy
Date: Thu Dec  6 12:05:23 2012
New Revision: 1417810

URL: http://svn.apache.org/viewvc?rev=1417810&view=rev
Log:
[MCOMPILER-190] use plexus-compiler released version

Modified:
maven/plugins/trunk/maven-compiler-plugin/pom.xml

Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1417810&r1=1417809&r2=1417810&view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Thu Dec  6 12:05:23 2012
@@ -54,7 +54,7 @@ under the License.
   
 2.0.9
 3.2
-2.1-SNAPSHOT
+2.1
 1.8.0
 2.6.0-01

svn commit: r1417886 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties

2012-12-06 Thread andham 
Author: andham
Date: Thu Dec  6 13:52:51 2012
New Revision: 1417886

URL: http://svn.apache.org/viewvc?rev=1417886&view=rev
Log:
[MPIR-260] Swedish translation for report.dependency-info.* props

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties?rev=1417886&r1=1417885&r2=1417886&view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties
 Thu Dec  6 13:52:51 2012
@@ -110,6 +110,9 @@ report.dependency-convergence.stats.read
 report.dependency-convergence.stats.snapshots  = Antal 
SNAPSHOT artefakter (Number of SNAPSHOTs, NOS):
 report.dependency-convergence.stats.subprojects= Antal 
underprojekt:
 report.dependency-convergence.title= 
Beroendekonvergens fr\u00e5n Reactor
+report.dependency-info.name= 
Beroendeinformation
+report.dependency-info.title   = 
Beroendeinformation
+report.dependency-info.description = Detta 
dokument beskriver hur man l\u00e4gger till ett beroende till detta projekts 
huvudartefakt med olika beroendehanteringsverktyg.
 report.index.nodescription = Det finns 
ingen beskrivning f\u00f6r detta projekt.
 report.index.title = Om
 report.issuetracking.bugzilla.intro= Detta 
projekt anv\u00e4nder {Bugzilla, http://www.bugzilla.org/}.

svn commit: r1417917 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main: java/org/apache/maven/report/projectinfo/ resources/

2012-12-06 Thread andham 
Author: andham
Date: Thu Dec  6 14:35:42 2012
New Revision: 1417917

URL: http://svn.apache.org/viewvc?rev=1417917&view=rev
Log:
[MPIR-262] Add support for 'report.cim.bamboo.intro' resource property

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_cs.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_hu.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_it.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ja.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_lt.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_nl.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_no.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pl.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ru.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sk.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_tr.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties

maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_TW.properties

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java?rev=1417917&r1=1417916&r2=1417917&view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
 Thu Dec  6 14:35:42 2012
@@ -117,6 +117,10 @@ public class CimReport
 {
 linkPatternedText( getI18nString( "anthill.intro" ) );
 }
+else if ( isCimSystem( system, "bamboo" ) )
+{
+linkPatternedText( getI18nString( "bamboo.intro" ) );
+}
 else if ( isCimSystem( system, "buildforge" ) )
 {
 linkPatternedText( getI18nString( "buildforge.intro" ) );

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties?rev=1417917&r1=1417916&r2=1417917&view=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
 Thu Dec  6 14:35:42 2012
@@ -17,6 +17,7 @@
 
 report.cim.access  = Access
 report.cim.anthill.intro   = This 
project uses {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
+report.cim.bamboo.intro= This 
project uses {Bamboo, http://www.atlassian.com/software/bamboo/}.
 report.cim.buildfor

git commit: o IT's now support embedded mode with maven 3.0.4

2012-12-06 Thread krosenvold 
Updated Branches:
  refs/heads/master d39c290e7 -> 00e31e5a8


o IT's now support embedded mode with maven 3.0.4


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/00e31e5a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/00e31e5a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/00e31e5a

Branch: refs/heads/master
Commit: 00e31e5a8552b2264762726e8aee812561b872a0
Parents: d39c290
Author: Kristian Rosenvold 
Authored: Thu Dec 6 19:03:44 2012 +0100
Committer: Kristian Rosenvold 
Committed: Thu Dec 6 19:03:44 2012 +0100

--
 .../surefire/StartupReportConfiguration.java   |2 +-
 .../plugin/surefire/booterclient/ForkStarter.java  |8 ++
 .../surefire/booterclient/output/ForkClient.java   |   10 +-
 .../plugin/surefire/report/ConsoleReporter.java|   13 +--
 surefire-integration-tests/pom.xml |   90 +++
 .../surefire/its/JUnit48TestCategoriesIT.java  |6 +-
 .../maven/surefire/its/WorkingDirectoryIT.java |3 +-
 .../surefire/its/fixture/SurefireLauncher.java |7 +
 .../src/test/java/forkMode/Test1.java  |2 +-
 .../fork-mode/src/test/java/forkMode/Test1.java|8 +-
 .../surefire/junitcore/JUnitCoreProvider.java  |3 +-
 11 files changed, 76 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/00e31e5a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
index a27ff54..b29ed38 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
@@ -162,7 +162,7 @@ public class StartupReportConfiguration
 
 public ConsoleReporter instantiateConsoleReporter()
 {
-return shouldReportToConsole() ? new ConsoleReporter() : null;
+return shouldReportToConsole() ? new 
ConsoleReporter(originalSystemOut) : null;
 }
 
 private boolean shouldReportToConsole()

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/00e31e5a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index a1ecc9b..31f2475 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -420,6 +420,14 @@ public class ForkStarter
 {
 runResult = 
fileReporterFactory.getGlobalRunStatistics().getRunResult();
 }
+if (!runResult.isTimeout()  && !forkClient.isSaidGoodBye())
+{
+//noinspection ThrowFromFinallyBlock
+throw new RuntimeException(
+"The forked VM terminated without saying properly goodbye. 
VM crash or System.exit called ?" +
+"\nCommand was" + cli.toString());
+}
+
 forkClient.close( runResult.isTimeout());
 }
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/00e31e5a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
index fa7d141..2d77085 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@ -267,11 +267,11 @@ public class ForkClient
 
 public void close(boolean hadTimeout)
 {
-if ( !saidGoodBye && !hadTimeout)
-{
-throw new RuntimeException(
-"The forked VM terminated without saying properly goodbye. VM 
crash or System.exit called ?" );
-}
+}
+
+public boolean isSaidGoodBye()
+{
+

svn commit: r1418025 - /maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/multi-module-configuration.apt.vm

2012-12-06 Thread hboutemy 
Author: hboutemy
Date: Thu Dec  6 18:35:01 2012
New Revision: 1418025

URL: http://svn.apache.org/viewvc?rev=1418025&view=rev
Log:
simplified configuration and command to run

Modified:

maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/multi-module-configuration.apt.vm

Modified: 
maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/multi-module-configuration.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/multi-module-configuration.apt.vm?rev=1418025&r1=1418024&r2=1418025&view=diff
==
--- 
maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/multi-module-configuration.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/multi-module-configuration.apt.vm
 Thu Dec  6 18:35:01 2012
@@ -2,8 +2,9 @@
  Maven Multi Module Configuration
  --
  Olivier Lamy
+ Hervé Boutemy
  --
- 2012-09-04
+ 2012-12-06
  --
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -30,18 +31,16 @@ Maven Multi Module Configuration
 
   With a multi modules build you can not use: mvn site-deploy. You must stage 
your site first.
 
-  Cli to use: <>
+  Cli command to use: <>
 
 +---
 
   
 
 ${user.home}
-\${site.mainDirectory}
 // it's a default location for performance reason (not checkout the 
content all the time)
 // you can override this value in your settings.
-\${site.mainDirectory}
-file://${siteContent.path}
+${site.mainDirectory}
   
 
   
@@ -50,16 +49,11 @@ Maven Multi Module Configuration
 ${project.version}
 
   ${scmCheckout.path}
-  ${siteContent.path}
 
   
   
 org.apache.maven.plugins
 maven-site-plugin
-3.1
-
-  ${siteDeploy.url}
-
   
 
 +---

[6/6] o Reformatted entire code base to code style

2012-12-06 Thread krosenvold 
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
--
diff --git 
a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
 
b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
index 5354685..d2cc117 100644
--- 
a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
+++ 
b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
@@ -89,19 +89,20 @@ public class JUnit4Provider
 {
 if ( testsToRun == null )
 {
-if (forkTestSet instanceof TestsToRun)
+if ( forkTestSet instanceof TestsToRun )
 {
 testsToRun = (TestsToRun) forkTestSet;
 }
-else if (forkTestSet instanceof Class)
+else if ( forkTestSet instanceof Class )
 {
 testsToRun = TestsToRun.fromClass( (Class) forkTestSet );
-} else
+}
+else
 {
 testsToRun = scanClassPath();
 }
 }
-
+
 upgradeCheck();
 
 final ReporterFactory reporterFactory = 
providerParameters.getReporterFactory();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/surefire-junit47/pom.xml
--
diff --git a/surefire-providers/surefire-junit47/pom.xml 
b/surefire-providers/surefire-junit47/pom.xml
index c68adee..ddfb73d 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -17,7 +17,8 @@
   ~ under the License.
   -->
 
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   4.0.0
 
   

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
--
diff --git 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
index a15e6ff..fc1dde1 100644
--- 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
+++ 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
@@ -75,10 +75,10 @@ public abstract class ConcurrentReporterManager
 
 public void testFailed( ReportEntry failure )
 {
-   final TestMethod testMethod = getOrCreateTestMethod( failure );
-if (testMethod != null)
+final TestMethod testMethod = getOrCreateTestMethod( failure );
+if ( testMethod != null )
 {
-   testMethod.testFailure( failure );
+testMethod.testFailure( failure );
 }
 }
 
@@ -101,10 +101,10 @@ public abstract class ConcurrentReporterManager
 
 public void testAssumptionFailure( ReportEntry failure )
 {
-   final TestMethod testMethod = getOrCreateTestMethod( failure );
-   if (testMethod != null)
+final TestMethod testMethod = getOrCreateTestMethod( failure );
+if ( testMethod != null )
 {
-   testMethod.testIgnored( failure );
+testMethod.testIgnored( failure );
 }
 }
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a303827d/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
--
diff --git 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
index b2608e8..81ea524 100644
--- 
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
+++ 
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
 import org.a

git commit: o Switched back to shadedversion for running tests

2012-12-06 Thread krosenvold 
Updated Branches:
  refs/heads/master a303827d6 -> 87fca1e08


o Switched back to shadedversion for running tests


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/87fca1e0
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/87fca1e0
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/87fca1e0

Branch: refs/heads/master
Commit: 87fca1e08ec0e961b01ff4c428f0a5702af9a595
Parents: a303827
Author: Kristian Rosenvold 
Authored: Thu Dec 6 21:13:33 2012 +0100
Committer: Kristian Rosenvold 
Committed: Thu Dec 6 21:14:39 2012 +0100

--
 surefire-integration-tests/pom.xml |3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/87fca1e0/surefire-integration-tests/pom.xml
--
diff --git a/surefire-integration-tests/pom.xml 
b/surefire-integration-tests/pom.xml
index e47a303..e23c4ee 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -91,7 +91,7 @@
   
   
 maven-failsafe-plugin
-${project.version}
+${shadedVersion}
 
   1
   false
@@ -168,7 +168,6 @@
 
   
 maven-failsafe-plugin
-${shadedVersion}
 
   classes
   ${surefire.threadcount}

[1/2] git commit: o Simplified logic

2012-12-06 Thread krosenvold 
Updated Branches:
  refs/heads/master 87fca1e08 -> f1b26856d


o Simplified logic


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f1b26856
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f1b26856
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f1b26856

Branch: refs/heads/master
Commit: f1b26856d19e79415dc546c713db55bccad8c315
Parents: 9cc7b99
Author: Kristian Rosenvold 
Authored: Thu Dec 6 22:34:11 2012 +0100
Committer: Kristian Rosenvold 
Committed: Thu Dec 6 22:34:11 2012 +0100

--
 .../maven/plugin/surefire/SurefireHelper.java  |   21 --
 1 files changed, 12 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f1b26856/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
index fdbe9bb..2af5fa8 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
@@ -44,19 +44,22 @@ public final class SurefireHelper
 
 boolean timeoutOrOtherFailure = result.isFailureOrTimeout();
 
-if ( !timeoutOrOtherFailure && result.getCompletedCount() == 0 )
+if ( !timeoutOrOtherFailure )
 {
-if ( ( reportParameters.getFailIfNoTests() == null ) || 
!reportParameters.getFailIfNoTests() )
+if ( result.getCompletedCount() == 0 )
 {
-return;
+if ( ( reportParameters.getFailIfNoTests() == null ) || 
!reportParameters.getFailIfNoTests() )
+{
+return;
+}
+throw new MojoFailureException(
+"No tests were executed!  (Set -DfailIfNoTests=false to 
ignore this error.)" );
 }
-throw new MojoFailureException(
-"No tests were executed!  (Set -DfailIfNoTests=false to ignore 
this error.)" );
-}
 
-if ( !timeoutOrOtherFailure && result.isErrorFree() )
-{
-return;
+if ( result.isErrorFree() )
+{
+return;
+}
 }
 
 String msg = timeoutOrOtherFailure

[2/2] git commit: Cleaned up deps, removed test that was depending on map iteration order

2012-12-06 Thread krosenvold 
Cleaned up deps, removed test that was depending on map iteration order


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9cc7b99e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9cc7b99e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9cc7b99e

Branch: refs/heads/master
Commit: 9cc7b99e0781dc22e29d0001d1c1cfb73ccf8cf2
Parents: 87fca1e
Author: Kristian Rosenvold 
Authored: Thu Dec 6 22:27:34 2012 +0100
Committer: Kristian Rosenvold 
Committed: Thu Dec 6 22:27:34 2012 +0100

--
 maven-failsafe-plugin/pom.xml  |   24 +-
 .../apache/maven/plugin/failsafe/VerifyMojo.java   |7 +
 maven-surefire-common/pom.xml  |   16 +++--
 .../plugin/surefire/booterclient/ForkStarter.java  |8 -
 .../plugin/surefire/util/DirectoryScanner.java |2 +-
 maven-surefire-plugin/pom.xml  |   20 +---
 maven-surefire-report-plugin/pom.xml   |   10 --
 .../surefire/report/SurefireReportMojoTest.java|2 +-
 pom.xml|7 -
 .../apache/maven/surefire/suite/RunResultTest.java |   19 ---
 surefire-providers/surefire-testng/pom.xml |9 -
 11 files changed, 31 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-failsafe-plugin/pom.xml
--
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 03f58cd..b69a177 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -125,37 +125,17 @@
 
 
   org.apache.maven.surefire
-  surefire-booter
-
-
-  org.apache.maven.surefire
   maven-surefire-common
 
 
-  org.codehaus.plexus
-  plexus-utils
+  org.apache.maven.surefire
+  surefire-api
 
 
   org.apache.maven.shared
   maven-shared-utils
 
 
-  org.apache.maven
-  maven-artifact
-
-
-  org.apache.maven
-  maven-project
-
-
-  org.apache.maven
-  maven-core
-
-
-  org.apache.maven
-  maven-toolchain
-
-
   org.apache.maven.plugin-tools
   maven-plugin-annotations
   compile

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
--
diff --git 
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
 
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
index 9a2c2c0..fb41b93 100644
--- 
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
+++ 
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
@@ -37,7 +37,6 @@ import org.apache.maven.shared.utils.ReaderFactory;
 import org.apache.maven.shared.utils.StringUtils;
 import org.apache.maven.shared.utils.io.IOUtil;
 import org.apache.maven.surefire.suite.RunResult;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 /**
  * Verify integration tests ran using Surefire.
@@ -191,17 +190,13 @@ public class VerifyMojo
 {
 throw new MojoExecutionException( e.getMessage(), e );
 }
-catch ( XmlPullParserException e )
-{
-throw new MojoExecutionException( e.getMessage(), e );
-}
 
 SurefireHelper.reportExecution( this, summary, getLog() );
 }
 }
 
 private RunResult readSummary( String encoding, File summaryFile )
-throws IOException, XmlPullParserException
+throws IOException
 {
 FileInputStream fileInputStream = null;
 BufferedInputStream bufferedInputStream = null;

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-surefire-common/pom.xml
--
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index bdcc14c..a6a03ca 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -49,6 +49,10 @@
 
 
   org.apache.maven.surefire
+  surefire-api
+
+
+  org.apache.maven.surefire
   surefire-booter
 
 
@@ -61,10 +65,18 @@
 
 
   org.apache.maven
+  maven-plugin-descriptor
+
+
+  org.apache.maven
   maven-project
 
 
   org.apache.maven
+  maven-model
+
+
+  org.apache.maven
   maven-core
 
 
@@ -76,10 +88,6 @@
   commons-lang3

svn commit: r1418141 - /maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/various-tips.apt.vm

2012-12-06 Thread hboutemy 
Author: hboutemy
Date: Fri Dec  7 00:21:46 2012
New Revision: 1418141

URL: http://svn.apache.org/viewvc?rev=1418141&view=rev
Log:
simplified configurations

Modified:

maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/various-tips.apt.vm

Modified: 
maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/various-tips.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/various-tips.apt.vm?rev=1418141&r1=1418140&r2=1418141&view=diff
==
--- 
maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/various-tips.apt.vm 
(original)
+++ 
maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/various-tips.apt.vm 
Fri Dec  7 00:21:46 2012
@@ -28,7 +28,7 @@
 
 Various tips for using this plugin
 
-* URLS format
+* URL format
 
   You must use a scm url format:
 
@@ -36,50 +36,49 @@ Various tips for using this plugin
   scm:
 +
 
-  Svn example: 
scm:svn:https://svn.apache.org/repos/infra/websites/production/maventest/content/plugins/maven-scm-publish-plugin/
+  Example for svn: 
<>>
 
   And configure is as it:
 
 +
-
-
-  org.apache.maven.plugins
-  maven-scm-publish-plugin
-  ${project.version}
-  
-scmUrl
-  
-
-
+  
+
+  site_id
+  
scm:svn:https://svn.apache.org/repos/infra/websites/production/maventest/content/plugins/maven-scm-publish-plugin/
+
+  
 +
 
-  <>: with the svn if the remote url doesn't exist it will be created.
+  <>: with svn, if the remote url doesn't exist, it will be created.
 
 * Git branch
 
   To use git branch (by example: github gh-pages)
 
 +
-
+  
+
+  site_id
+  scm:git:g...@github.com:username/tomcat-foo-artifact.git
+
+  
+...
 
   org.apache.maven.plugins
   maven-scm-publish-plugin
   ${project.version}
   
 gh-pages
-
scm:git:g...@github.com:olamy/tomcat-foo-artifact.git
   
 
-
 +
 
 
 * Some Tips to improve performance
 
-  By default, a complete checkout is done, you can configure the plugin to try 
update rather than a full checkout/clone
+  By default, a complete checkout is done. You can configure the plugin to try 
update rather than a full checkout/clone
 
 +
-
 
   org.apache.maven.plugins
   maven-scm-publish-plugin
@@ -88,12 +87,11 @@ Various tips for using this plugin
 true
   
 
-
 +
 
-  By defaut, the scm content is checkout/clone to 
$\{project.build.directory}/scmpublish-checkout, so when running mvn clean
-  all the content is deleted. You can configure a path to your machine to 
avoid full checkout. 
-  A recommended way is to use a property with a default as it your colleague 
will be able to override in their settings.
+  By defaut, the scm content is checked-out/cloned to 
<<<$\{project.build.directory}/scmpublish-checkout>>>, so when running <<>>,
+  all the content is deleted. You can configure a path to your machine to 
avoid full checkout.
+  A recommended way is to use a property with a default value that your 
colleague will be able to override in their settings.
 
 +
 
@@ -115,7 +113,10 @@ Various tips for using this plugin
 
 +
 
-  You can use svnjava rather than svn cli if you use a machine without svn cli.
+
+* Using alternate scm provider
+
+  You can use svnjava rather than default svn cli if you use a machine without 
svn cli.
 
 +
 
@@ -141,8 +142,3 @@ Various tips for using this plugin
   
 
 +
-
-
-
-
-

svn commit: r1418142 - /maven/plugins/trunk/maven-scm-publish-plugin/pom.xml

2012-12-06 Thread hboutemy 
Author: hboutemy
Date: Fri Dec  7 00:27:21 2012
New Revision: 1418142

URL: http://svn.apache.org/viewvc?rev=1418142&view=rev
Log:
changed name to match standard core plugin names: Maven xxx Plugin

Modified:
maven/plugins/trunk/maven-scm-publish-plugin/pom.xml

Modified: maven/plugins/trunk/maven-scm-publish-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/pom.xml?rev=1418142&r1=1418141&r2=1418142&view=diff
==
--- maven/plugins/trunk/maven-scm-publish-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-scm-publish-plugin/pom.xml Fri Dec  7 00:27:21 
2012
@@ -33,7 +33,7 @@ under the License.
   1.0-SNAPSHOT
   maven-plugin
 
-  SCM Publish Maven Plugin
+  Maven SCM Publish Plugin
   http://maven.apache.org/plugins/maven-scm-publish-plugin