You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2014/01/24 17:38:18 UTC
git commit: Slight addition to MNG-5389 so that the afterSessionEnd
method throws a MavenExecutionException like the other methods in the
participant
Updated Branches:
refs/heads/master 8f3eca3d0 -> b05dd063f
Slight addition to MNG-5389 so that the afterSessionEnd method throws a MavenExecutionException like the other methods in the participant
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b05dd063
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b05dd063
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b05dd063
Branch: refs/heads/master
Commit: b05dd063f9572a8741dfe5433eda06451f8b8b85
Parents: 8f3eca3
Author: Jason van Zyl <ja...@tesla.io>
Authored: Fri Jan 24 11:36:50 2014 -0500
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Fri Jan 24 11:36:50 2014 -0500
----------------------------------------------------------------------
.../AbstractMavenLifecycleParticipant.java | 1 +
.../java/org/apache/maven/DefaultMaven.java | 21 +++++++++++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/b05dd063/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
index 3bd5281..a6b687c 100644
--- a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
+++ b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
@@ -66,6 +66,7 @@ public abstract class AbstractMavenLifecycleParticipant
* code.
*/
public void afterSessionEnd( MavenSession session )
+ throws MavenExecutionException
{
// do nothing
}
http://git-wip-us.apache.org/repos/asf/maven/blob/b05dd063/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 064a556..76fc049 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -317,7 +317,14 @@ public class DefaultMaven
if ( result.hasExceptions() )
{
- afterSessionEnd( projects, session );
+ try
+ {
+ afterSessionEnd( projects, session );
+ }
+ catch (MavenExecutionException e)
+ {
+ return addExceptionToResult( result, e );
+ }
return result;
}
@@ -339,12 +346,20 @@ public class DefaultMaven
return addExceptionToResult( result, session.getResult().getExceptions().get( 0 ) );
}
- afterSessionEnd( projects, session );
+ try
+ {
+ afterSessionEnd( projects, session );
+ }
+ catch (MavenExecutionException e)
+ {
+ return addExceptionToResult( result, e );
+ }
return result;
}
- private void afterSessionEnd( Collection<MavenProject> projects, MavenSession session )
+ private void afterSessionEnd( Collection<MavenProject> projects, MavenSession session )
+ throws MavenExecutionException
{
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
try