Repository: maven Updated Branches: refs/heads/master 25f514316 -> ec14b8ad4
curses upon you IDE for screwing up the formatting Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ec14b8ad Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ec14b8ad Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ec14b8ad Branch: refs/heads/master Commit: ec14b8ad4c6613d04e3258101bdbf81588b658a9 Parents: 25f5143 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> Authored: Wed Jul 22 09:09:31 2015 +0100 Committer: Stephen Connolly <stephen.alan.conno...@gmail.com> Committed: Wed Jul 22 09:09:31 2015 +0100 ---------------------------------------------------------------------- .../maven/model/building/DefaultModelBuilder.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/ec14b8ad/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index f8f4dab..673a50f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -513,7 +513,7 @@ public class DefaultModelBuilder } } - problems.setSource(modelSource.getLocation()); + problems.setSource( modelSource.getLocation() ); try { boolean strict = request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0; @@ -594,10 +594,10 @@ public class DefaultModelBuilder 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 @@ public class DefaultModelBuilder 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 @@ public class DefaultModelBuilder activation = activation.clone(); } - activations.put(profile.getId(), activation); + activations.put( profile.getId(), activation ); } return activations; @@ -926,8 +926,8 @@ public class DefaultModelBuilder // 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;
