You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/01/01 15:02:31 UTC

[maven] branch master updated: Revert "[MNG-5982] Pass user properties to ModelBuildingRequest"

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

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d63038  Revert "[MNG-5982] Pass user properties to ModelBuildingRequest"
6d63038 is described below

commit 6d630388e6b4910d68eaf14a1b56301c7c6f3eba
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Jan 1 16:01:14 2020 +0100

    Revert "[MNG-5982] Pass user properties to ModelBuildingRequest"
    
    This reverts commit 5553ff0ca6b9888a72343268cc3aa92489e424d9.
---
 .../maven/repository/internal/DefaultArtifactDescriptorReader.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 5146ea7..586c83e 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -275,7 +275,6 @@ public class DefaultArtifactDescriptorReader
                 modelRequest.setTwoPhaseBuilding( false );
                 modelRequest.setSystemProperties( toProperties( session.getUserProperties(),
                                                                 session.getSystemProperties() ) );
-                modelRequest.setUserProperties( toProperties( session.getUserProperties(), null ) );
                 modelRequest.setModelCache( DefaultModelCache.newInstance( session ) );
                 modelRequest.setModelResolver( new DefaultModelResolver( session, trace.newChild( modelRequest ),
                                                                          request.getRequestContext(), artifactResolver,