You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/07/24 18:42:51 UTC

[maven] branch MNG-6704 updated (13a4d9a -> ae5332f)

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

michaelo pushed a change to branch MNG-6704
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard 13a4d9a  [MNG-6704] MavenRepositorySystemUtils.newSession() misses assignment
     new ae5332f  [MNG-6704] MavenRepositorySystemUtils.newSession() misses assignment

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (13a4d9a)
            \
             N -- N -- N   refs/heads/MNG-6704 (ae5332f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/maven/artifact/AbstractArtifactComponentTestCase.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[maven] 01/01: [MNG-6704] MavenRepositorySystemUtils.newSession() misses assignment

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit ae5332f1ebc836e07431a86d20a11994f6d44f12
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 11 11:48:58 2019 +0200

    [MNG-6704] MavenRepositorySystemUtils.newSession() misses assignment
---
 .../org/apache/maven/artifact/AbstractArtifactComponentTestCase.java  | 2 +-
 .../apache/maven/repository/internal/MavenRepositorySystemUtils.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 0cdea19..2ce3794 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -360,7 +360,7 @@ public abstract class AbstractArtifactComponentTestCase
         DependencyGraphTransformer transformer =
             new ConflictResolver( new NearestVersionSelector(), new JavaScopeSelector(),
                                   new SimpleOptionalitySelector(), new JavaScopeDeriver() );
-        new ChainedDependencyGraphTransformer( transformer, new JavaDependencyContextRefiner() );
+        transformer = new ChainedDependencyGraphTransformer( transformer, new JavaDependencyContextRefiner() );
         session.setDependencyGraphTransformer( transformer );
 
         LocalRepository localRepo = new LocalRepository( localRepository().getBasedir() );
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 1b11cb3..97035b3 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -106,7 +106,7 @@ public final class MavenRepositorySystemUtils
         DependencyGraphTransformer transformer =
             new ConflictResolver( new NearestVersionSelector(), new JavaScopeSelector(),
                                   new SimpleOptionalitySelector(), new JavaScopeDeriver() );
-        new ChainedDependencyGraphTransformer( transformer, new JavaDependencyContextRefiner() );
+        transformer = new ChainedDependencyGraphTransformer( transformer, new JavaDependencyContextRefiner() );
         session.setDependencyGraphTransformer( transformer );
 
         DefaultArtifactTypeRegistry stereotypes = new DefaultArtifactTypeRegistry();
@@ -127,7 +127,7 @@ public final class MavenRepositorySystemUtils
         session.setArtifactDescriptorPolicy( new SimpleArtifactDescriptorPolicy( true, true ) );
 
         final Properties systemProperties = new Properties();
-        
+
         // MNG-5670 guard against ConcurrentModificationException
         // MNG-6053 guard against key without value
         Properties sysProp = System.getProperties();