mirror of https://github.com/apache/maven.git
code formatting
This commit is contained in:
parent
ab86435af1
commit
71a8427df6
|
@ -133,8 +133,10 @@ public MavenExecutionPlan resolveBuildPlan( MavenSession session, MavenProject p
|
||||||
return executionPlan;
|
return executionPlan;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void handleBuildError(final ReactorContext buildContext, final MavenSession rootSession, final MavenSession currentSession,
|
public void handleBuildError( final ReactorContext buildContext, final MavenSession rootSession,
|
||||||
final MavenProject mavenProject, Exception e, final long buildStartTime) {
|
final MavenSession currentSession, final MavenProject mavenProject, Exception e,
|
||||||
|
final long buildStartTime )
|
||||||
|
{
|
||||||
if ( e instanceof RuntimeException )
|
if ( e instanceof RuntimeException )
|
||||||
{
|
{
|
||||||
e = new InternalErrorException( "Internal error: " + e, e );
|
e = new InternalErrorException( "Internal error: " + e, e );
|
||||||
|
@ -185,5 +187,4 @@ public static String getKey( MavenProject project )
|
||||||
return project.getGroupId() + ':' + project.getArtifactId() + ':' + project.getVersion();
|
return project.getGroupId() + ':' + project.getArtifactId() + ':' + project.getVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,7 +92,7 @@ public void buildProject( MavenSession session, MavenSession rootSession, Reacto
|
||||||
}
|
}
|
||||||
catch ( Exception e )
|
catch ( Exception e )
|
||||||
{
|
{
|
||||||
builderCommon.handleBuildError(reactorContext, rootSession, session, currentProject, e, buildStartTime);
|
builderCommon.handleBuildError( reactorContext, rootSession, session, currentProject, e, buildStartTime );
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
|
|
@ -375,13 +375,14 @@ private Artifact findTestScopedArtifact( MavenProject upstreamProject )
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isThreadLockedAndEmpty(Artifact artifact){
|
private static boolean isThreadLockedAndEmpty( Artifact artifact )
|
||||||
return artifact instanceof ThreadLockedArtifact && !((ThreadLockedArtifact) artifact).hasReal();
|
{
|
||||||
|
return artifact instanceof ThreadLockedArtifact && !( (ThreadLockedArtifact) artifact ).hasReal();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Artifact findDependency( MavenProject project, Artifact upStreamArtifact )
|
private static Artifact findDependency( MavenProject project, Artifact upStreamArtifact )
|
||||||
{
|
{
|
||||||
if ( upStreamArtifact == null || isThreadLockedAndEmpty(upStreamArtifact))
|
if ( upStreamArtifact == null || isThreadLockedAndEmpty( upStreamArtifact ) )
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -483,8 +484,6 @@ public void resolveFromUpstream()
|
||||||
artifactInThis.setFile( upstream.getFile() );
|
artifactInThis.setFile( upstream.getFile() );
|
||||||
artifactInThis.setRepository( upstream.getRepository() );
|
artifactInThis.setRepository( upstream.getRepository() );
|
||||||
artifactInThis.setResolved( true ); // Or maybe upstream.isResolved()....
|
artifactInThis.setResolved( true ); // Or maybe upstream.isResolved()....
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue