[maven] branch MNG-6656 updated: [MNG-6656] Clean up code

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/MNG-6656 by this push:
     new 7ba7bef  [MNG-6656] Clean up code
7ba7bef is described below

commit 7ba7befae24fd0016f2bd95a0c3013f5ccc1d00e
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sun Mar 1 17:34:42 2020 +0100

    [MNG-6656] Clean up code
---
 .../DefaultRepositorySystemSessionFactory.java     | 23 +++++++++++-----------
 .../maven/project/DefaultProjectBuilder.java       |  1 -
 .../apache/maven/project/ProjectBuilderTest.java   |  4 ++--
 .../maven/model/building/DefaultModelBuilder.java  |  7 +------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git 
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
 
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index 2e6a8a5..8973b20 100644
--- 
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++ 
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -19,15 +19,6 @@ package org.apache.maven.internal.aether;
  * under the License.
  */
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.bridge.MavenRepositorySystem;
@@ -60,6 +51,14 @@ import 
org.eclipse.aether.util.repository.DefaultProxySelector;
 import org.eclipse.aether.util.repository.SimpleResolutionErrorPolicy;
 import org.eclipse.sisu.Nullable;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+
 /**
  * @since 3.3.0
  */
@@ -93,7 +92,7 @@ public class DefaultRepositorySystemSessionFactory
 
     @Inject
     MavenRepositorySystem mavenRepositorySystem;
-    
+
     public DefaultRepositorySystemSession newRepositorySession( 
MavenExecutionRequest request )
     {
         DefaultRepositorySystemSession session = 
MavenRepositorySystemUtils.newSession();
@@ -241,7 +240,7 @@ public class DefaultRepositorySystemSessionFactory
 
         return session;
     }
-    
+
     private String getUserAgent()
     {
         return "Apache-Maven/" + getMavenVersion() + " (Java " + 
System.getProperty( "java.version" ) + "; "
@@ -268,4 +267,4 @@ public class DefaultRepositorySystemSessionFactory
         return props.getProperty( "version", "unknown-version" );
     }
 
-}
+}
\ No newline at end of file
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 8d93ea4..ece4719 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -543,7 +543,6 @@ public class DefaultProjectBuilder
 
         Model model = result.getEffectiveModel();
         
-        // move to here!!
         poolBuilder.put( model.getPomFile().toPath(),  result.getRawModel() );
         
         try
diff --git 
a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java 
b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
index 6c7fbf9..538f887 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -159,7 +159,7 @@ public class ProjectBuilderTest
             File parent = new File( tempDir.toFile(), "pom.xml" );
             String parentContent = FileUtils.fileRead( parent );
             parentContent = parentContent.replaceAll( 
"<packaging>pom</packaging>",
-                    
"<packaging>pom</packaging><properties><addedProperty>addedValue</addedProperty></properties>"
 );
+                     
"<packaging>pom</packaging><properties><addedProperty>addedValue</addedProperty></properties>"
 );
             FileUtils.fileWrite( parent, "UTF-8", parentContent );
             // re-build pom with modified parent
             ProjectBuildingResult result = projectBuilder.build( child, 
configuration );
@@ -330,4 +330,4 @@ public class ProjectBuilderTest
         assertEquals( 1, project.getMailingLists().size() );
         assertEquals( 1, project.getResources().size() );
     }
-}
\ No newline at end of file
+}
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 3b25296..ff7fb91 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
@@ -292,7 +292,7 @@ public class DefaultModelBuilder
         {
             inputModel = readModel( request.getModelSource(), 
request.getPomFile(), request, problems );
         }
-        
+
         problems.setRootModel( inputModel );
 
         ModelData resultData = new ModelData( request.getModelSource(), 
inputModel );
@@ -438,11 +438,6 @@ public class DefaultModelBuilder
 
         result.setEffectiveModel( resultModel );
         
-        if ( request.getPomFile() != null )
-        {
-            // request.getModelCache().put( request.getPomFile().toPath(), 
resultModel ); 
-        }
-
         for ( ModelData currentData : lineage )
         {
             String modelId = ( currentData != superData ) ? 
currentData.getId() : "";