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/25 19:59:13 UTC
[maven] branch master updated: [MNG-6704]
MavenRepositorySystemUtils.newSession() misses assignment
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 2d0c3bc [MNG-6704] MavenRepositorySystemUtils.newSession() misses assignment
2d0c3bc is described below
commit 2d0c3bc75b9fa191846ce5b43f6900701a1bf825
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();