Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-6704] MavenRepositorySystemUtils.newSession() misses assignment

This commit is contained in:
Michael Osipov 2019-07-11 11:48:58 +02:00
parent 690841e9be
commit 2d0c3bc75b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
View File

@ -360,7 +360,7 @@ public abstract class AbstractArtifactComponentTestCase
DependencyGraphTransformer transformer = DependencyGraphTransformer transformer =
new ConflictResolver( new NearestVersionSelector(), new JavaScopeSelector(), new ConflictResolver( new NearestVersionSelector(), new JavaScopeSelector(),
new SimpleOptionalitySelector(), new JavaScopeDeriver() ); new SimpleOptionalitySelector(), new JavaScopeDeriver() );
new ChainedDependencyGraphTransformer( transformer, new JavaDependencyContextRefiner() ); transformer = new ChainedDependencyGraphTransformer( transformer, new JavaDependencyContextRefiner() );
session.setDependencyGraphTransformer( transformer ); session.setDependencyGraphTransformer( transformer );
LocalRepository localRepo = new LocalRepository( localRepository().getBasedir() ); LocalRepository localRepo = new LocalRepository( localRepository().getBasedir() );

4
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
View File

@ -106,7 +106,7 @@ public final class MavenRepositorySystemUtils
DependencyGraphTransformer transformer = DependencyGraphTransformer transformer =
new ConflictResolver( new NearestVersionSelector(), new JavaScopeSelector(), new ConflictResolver( new NearestVersionSelector(), new JavaScopeSelector(),
new SimpleOptionalitySelector(), new JavaScopeDeriver() ); new SimpleOptionalitySelector(), new JavaScopeDeriver() );
new ChainedDependencyGraphTransformer( transformer, new JavaDependencyContextRefiner() ); transformer = new ChainedDependencyGraphTransformer( transformer, new JavaDependencyContextRefiner() );
session.setDependencyGraphTransformer( transformer ); session.setDependencyGraphTransformer( transformer );
DefaultArtifactTypeRegistry stereotypes = new DefaultArtifactTypeRegistry(); DefaultArtifactTypeRegistry stereotypes = new DefaultArtifactTypeRegistry();
@ -127,7 +127,7 @@ public final class MavenRepositorySystemUtils
session.setArtifactDescriptorPolicy( new SimpleArtifactDescriptorPolicy( true, true ) ); session.setArtifactDescriptorPolicy( new SimpleArtifactDescriptorPolicy( true, true ) );
final Properties systemProperties = new Properties(); final Properties systemProperties = new Properties();
// MNG-5670 guard against ConcurrentModificationException // MNG-5670 guard against ConcurrentModificationException
// MNG-6053 guard against key without value // MNG-6053 guard against key without value
Properties sysProp = System.getProperties(); Properties sysProp = System.getProperties();