Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-03-06 00:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

curses upon you IDE for screwing up the formatting

Browse Source
This commit is contained in:
Stephen Connolly 2015-07-22 09:09:31 +01:00
parent 25f5143169
commit ec14b8ad4c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
View File

@ -513,7 +513,7 @@ private Model readModel( ModelSource modelSource, File pomFile, ModelBuildingReq
}
}
problems.setSource(modelSource.getLocation());
problems.setSource( modelSource.getLocation() );
try
{
boolean strict = request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0;
@ -594,10 +594,10 @@ private Model readModel( ModelSource modelSource, File pomFile, ModelBuildingReq
throw problems.newModelBuildingException();
}
model.setPomFile(pomFile);
model.setPomFile( pomFile );
problems.setSource(model);
modelValidator.validateRawModel(model, request, problems);
problems.setSource( model );
modelValidator.validateRawModel( model, request, problems );
if ( hasFatalErrors( problems ) )
{
@ -615,7 +615,7 @@ private DefaultProfileActivationContext getProfileActivationContext( ModelBuildi
context.setInactiveProfileIds( request.getInactiveProfileIds() );
context.setSystemProperties( request.getSystemProperties() );
context.setUserProperties( request.getUserProperties() );
context.setProjectDirectory((request.getPomFile() != null) ? request.getPomFile().getParentFile() : null);
context.setProjectDirectory( ( request.getPomFile() != null ) ? request.getPomFile().getParentFile() : null );
return context;
}
@ -735,7 +735,7 @@ private Map<String, Activation> getProfileActivations( Model model, boolean clon
activation = activation.clone();
}
activations.put(profile.getId(), activation);
activations.put( profile.getId(), activation );
}
return activations;
@ -926,8 +926,8 @@ private ModelData readParentLocally( Model childModel, ModelSource childSource,
// for determining if the parent is within the range in scope. This may lead to MNG-5840 style
// regressions in the range, but without this the parent version range will not work at all.
//
if ( !parent.getVersion().startsWith("[") && !parent.getVersion().startsWith("(") )
if ( !parent.getVersion().startsWith( "[" ) && !parent.getVersion().startsWith( "(" ) )
{
// version skew drop back to resolution from the repository
return null;