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

[MNG-6843] Parallel build fails due to missing JAR artifacts in compilePath 

Signed-off-by: rfscholte <rfscholte@apache.org>
This commit is contained in:
Falko Modler 2021-06-25 19:28:40 +02:00 committed by rfscholte
parent 6bed162a65
commit 73e00ed85d
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -111,10 +111,6 @@ public class MavenProject
private Set<Artifact> resolvedArtifacts; private Set<Artifact> resolvedArtifacts;
private ArtifactFilter artifactFilter;
private Set<Artifact> artifacts;
private Artifact parentArtifact; private Artifact parentArtifact;
private Set<Artifact> pluginArtifacts; private Set<Artifact> pluginArtifacts;
@ -151,8 +147,8 @@ public class MavenProject
private Artifact artifact; private Artifact artifact;
// calculated. private final ThreadLocal<ArtifactsHolder> threadLocalArtifactsHolder =
private Map<String, Artifact> artifactMap; ThreadLocal.withInitial( ArtifactsHolder::new );
private Model originalModel; private Model originalModel;
@ -695,10 +691,11 @@ public class MavenProject
public void setArtifacts( Set<Artifact> artifacts ) public void setArtifacts( Set<Artifact> artifacts )
{ {
this.artifacts = artifacts; ArtifactsHolder artifactsHolder = threadLocalArtifactsHolder.get();
artifactsHolder.artifacts = artifacts;
// flush the calculated artifactMap // flush the calculated artifactMap
artifactMap = null; artifactsHolder.artifactMap = null;
} }
/** /**
@ -711,34 +708,36 @@ public class MavenProject
*/ */
public Set<Artifact> getArtifacts() public Set<Artifact> getArtifacts()
{ {
if ( artifacts == null ) ArtifactsHolder artifactsHolder = threadLocalArtifactsHolder.get();
if ( artifactsHolder.artifacts == null )
{ {
if ( artifactFilter == null || resolvedArtifacts == null ) if ( artifactsHolder.artifactFilter == null || resolvedArtifacts == null )
{ {
artifacts = new LinkedHashSet<>(); artifactsHolder.artifacts = new LinkedHashSet<>();
} }
else else
{ {
artifacts = new LinkedHashSet<>( resolvedArtifacts.size() * 2 ); artifactsHolder.artifacts = new LinkedHashSet<>( resolvedArtifacts.size() * 2 );
for ( Artifact artifact : resolvedArtifacts ) for ( Artifact artifact : resolvedArtifacts )
{ {
if ( artifactFilter.include( artifact ) ) if ( artifactsHolder.artifactFilter.include( artifact ) )
{ {
artifacts.add( artifact ); artifactsHolder.artifacts.add( artifact );
} }
} }
} }
} }
return artifacts; return artifactsHolder.artifacts;
} }
public Map<String, Artifact> getArtifactMap() public Map<String, Artifact> getArtifactMap()
{ {
if ( artifactMap == null ) ArtifactsHolder artifactsHolder = threadLocalArtifactsHolder.get();
if ( artifactsHolder.artifactMap == null )
{ {
artifactMap = ArtifactUtils.artifactMapByVersionlessId( getArtifacts() ); artifactsHolder.artifactMap = ArtifactUtils.artifactMapByVersionlessId( getArtifacts() );
} }
return artifactMap; return artifactsHolder.artifactMap;
} }
public void setPluginArtifacts( Set<Artifact> pluginArtifacts ) public void setPluginArtifacts( Set<Artifact> pluginArtifacts )
@ -1428,8 +1427,9 @@ public class MavenProject
public void setResolvedArtifacts( Set<Artifact> artifacts ) public void setResolvedArtifacts( Set<Artifact> artifacts )
{ {
this.resolvedArtifacts = ( artifacts != null ) ? artifacts : Collections.<Artifact>emptySet(); this.resolvedArtifacts = ( artifacts != null ) ? artifacts : Collections.<Artifact>emptySet();
this.artifacts = null; ArtifactsHolder artifactsHolder = threadLocalArtifactsHolder.get();
this.artifactMap = null; artifactsHolder.artifacts = null;
artifactsHolder.artifactMap = null;
} }
/** /**
@ -1442,9 +1442,10 @@ public class MavenProject
*/ */
public void setArtifactFilter( ArtifactFilter artifactFilter ) public void setArtifactFilter( ArtifactFilter artifactFilter )
{ {
this.artifactFilter = artifactFilter; ArtifactsHolder artifactsHolder = threadLocalArtifactsHolder.get();
this.artifacts = null; artifactsHolder.artifactFilter = artifactFilter;
this.artifactMap = null; artifactsHolder.artifacts = null;
artifactsHolder.artifactMap = null;
} }
/** /**
@ -1839,7 +1840,6 @@ public class MavenProject
{ {
reportArtifactMap = ArtifactUtils.artifactMapByVersionlessId( getReportArtifacts() ); reportArtifactMap = ArtifactUtils.artifactMapByVersionlessId( getReportArtifacts() );
} }
return reportArtifactMap; return reportArtifactMap;
} }
@ -1864,7 +1864,6 @@ public class MavenProject
{ {
extensionArtifactMap = ArtifactUtils.artifactMapByVersionlessId( getExtensionArtifacts() ); extensionArtifactMap = ArtifactUtils.artifactMapByVersionlessId( getExtensionArtifacts() );
} }
return extensionArtifactMap; return extensionArtifactMap;
} }
@ -1986,4 +1985,11 @@ public class MavenProject
{ {
this.projectBuilderConfiguration = projectBuildingRequest; this.projectBuilderConfiguration = projectBuildingRequest;
} }
private static class ArtifactsHolder
{
private ArtifactFilter artifactFilter;
private Set<Artifact> artifacts;
private Map<String, Artifact> artifactMap;
}
} }