mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
more readable code
This commit is contained in:
1 parent
fdf2f63118
commit
2b20ed1d6a
1 file changed
+19
-14
@@ -679,22 +679,27 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
|
||||
final ProcessCache.MavenProcess process;
|
||||
|
||||
boolean maven3orLater = mavenBuildInformation.isMaven3OrLater();
|
||||
if ( maven3orLater )
|
||||
{
|
||||
LOGGER.fine( "using maven 3 " + mavenVersion );
|
||||
process = MavenBuild.mavenProcessCache.get( launcher.getChannel(), slistener,
|
||||
new Maven3ProcessFactory( project, MavenModuleSetBuild.this, launcher, envVars, getMavenOpts(listener, envVars),
|
||||
pom.getParent() ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGGER.fine( "using maven 2 " + mavenVersion );
|
||||
process = MavenBuild.mavenProcessCache.get( launcher.getChannel(), slistener,
|
||||
new MavenProcessFactory( project, MavenModuleSetBuild.this, launcher, envVars,getMavenOpts(listener, envVars),
|
||||
pom.getParent() ) );
|
||||
boolean maven3orLater = mavenBuildInformation.isMaven3OrLater();
|
||||
|
||||
MavenUtil.MavenVersion mavenVersionType = MavenUtil.getMavenVersion( mavenVersion );
|
||||
|
||||
ProcessCache.Factory factory = null;
|
||||
|
||||
switch ( mavenVersionType ){
|
||||
case MAVEN_2:
|
||||
LOGGER.fine( "using maven 2 " + mavenVersion );
|
||||
factory = new MavenProcessFactory( project, MavenModuleSetBuild.this, launcher, envVars,getMavenOpts(listener, envVars),
|
||||
pom.getParent() );
|
||||
break;
|
||||
default:
|
||||
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());
|
||||
FilePath localRepo = project.getLocalRepository().locate(MavenModuleSetBuild.this);
|
||||
if(localRepo!=null)
|
||||
|
||||
Reference in new issue
Block a user