提交 2b20ed1d 编写于 作者: O Olivier Lamy

more readable code

上级 fdf2f631
...@@ -679,22 +679,27 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven ...@@ -679,22 +679,27 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
final ProcessCache.MavenProcess process; final ProcessCache.MavenProcess process;
boolean maven3orLater = mavenBuildInformation.isMaven3OrLater(); boolean maven3orLater = mavenBuildInformation.isMaven3OrLater();
if ( maven3orLater )
{ MavenUtil.MavenVersion mavenVersionType = MavenUtil.getMavenVersion( mavenVersion );
LOGGER.fine( "using maven 3 " + mavenVersion );
process = MavenBuild.mavenProcessCache.get( launcher.getChannel(), slistener, ProcessCache.Factory factory = null;
new Maven3ProcessFactory( project, MavenModuleSetBuild.this, launcher, envVars, getMavenOpts(listener, envVars),
pom.getParent() ) ); switch ( mavenVersionType ){
} case MAVEN_2:
else LOGGER.fine( "using maven 2 " + mavenVersion );
{ factory = new MavenProcessFactory( project, MavenModuleSetBuild.this, launcher, envVars,getMavenOpts(listener, envVars),
LOGGER.fine( "using maven 2 " + mavenVersion ); pom.getParent() );
process = MavenBuild.mavenProcessCache.get( launcher.getChannel(), slistener, break;
new MavenProcessFactory( project, MavenModuleSetBuild.this, launcher, envVars,getMavenOpts(listener, envVars), default:
pom.getParent() ) ); LOGGER.fine( "using maven 3 " + mavenVersion );
factory = new Maven3ProcessFactory( project, MavenModuleSetBuild.this, launcher, envVars, getMavenOpts(listener, envVars),
pom.getParent() );
} }
process = MavenBuild.mavenProcessCache.get( launcher.getChannel(), slistener, factory);
ArgumentListBuilder margs = new ArgumentListBuilder().add("-B").add("-f", pom.getRemote()); ArgumentListBuilder margs = new ArgumentListBuilder().add("-B").add("-f", pom.getRemote());
FilePath localRepo = project.getLocalRepository().locate(MavenModuleSetBuild.this); FilePath localRepo = project.getLocalRepository().locate(MavenModuleSetBuild.this);
if(localRepo!=null) if(localRepo!=null)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册