mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
Use utility methods for Maven version comparisons
This commit is contained in:
1 parent
796918dad9
commit
0943a3aafa
4 files changed
+44
-18
No files matched your search
@@ -701,8 +701,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
|
||||
ProcessCache.MavenProcess process = null;
|
||||
|
||||
boolean maven3orLater = MavenUtil.maven3orLater( mavenVersion );
|
||||
|
||||
boolean maven3orLater = mavenBuildInformation.isMaven3OrLater();
|
||||
if ( maven3orLater )
|
||||
{
|
||||
LOGGER.fine( "using maven 3 " + mavenVersion );
|
||||
@@ -1190,7 +1189,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
// FIXME handle 3.1 level when version will be here : no rush :-)
|
||||
// or made something configurable tru the ui ?
|
||||
ReactorReader reactorReader = null;
|
||||
boolean maven3OrLater = new ComparableVersion (mavenVersion).compareTo( new ComparableVersion ("3.0") ) >= 0;
|
||||
boolean maven3OrLater = MavenUtil.maven3orLater(mavenVersion);
|
||||
if (maven3OrLater) {
|
||||
mavenEmbedderRequest.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 );
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user