rfscholte commented on a change in pull request #391:
URL: https://github.com/apache/maven/pull/391#discussion_r541998896
##########
File path:
maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
##########
@@ -386,44 +381,22 @@ private ModelSource createStubModelSource( Artifact
artifact )
ReactorModelPool.Builder poolBuilder = new ReactorModelPool.Builder();
final ReactorModelPool modelPool = poolBuilder.build();
- if ( Features.buildConsumer().isActive() )
- {
- final TransformerContext context = new TransformerContext()
- {
- @Override
- public String getUserProperty( String key )
- {
- return request.getUserProperties().getProperty( key );
- }
-
- @Override
- public Model getRawModel( Path p )
- {
- return modelPool.get( p );
- }
-
- @Override
- public Model getRawModel( String groupId, String artifactId )
- {
- return modelPool.get( groupId, artifactId, null );
- }
- };
- request.getRepositorySession().getData().set(
TransformerContext.KEY, context );
- }
-
- InternalConfig config = new InternalConfig( request, modelPool,
- useGlobalModelCache() ? getModelCache() : new
ReactorModelCache() );
+ InternalConfig config =
+ new InternalConfig( request, modelPool, useGlobalModelCache() ?
getModelCache() : new ReactorModelCache(),
+ modelBuilder.newTransformerContextBuilder() );
- Map<String, MavenProject> projectIndex = new HashMap<>( 256 );
+ Map<File, MavenProject> projectIndex = new HashMap<>( 256 );
+ // phase 1: get file Models from the reactor.
boolean noErrors =
build( results, interimResults, projectIndex, pomFiles, new
LinkedHashSet<>(), true, recursive,
config, poolBuilder );
-
+
ClassLoader oldContextClassLoader =
Thread.currentThread().getContextClassLoader();
try
{
+ // Phase 2: get effective from the reactor
Review comment:
models, fixed comment
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
