Skip to content

[MNG-7157] [MNG-6843] Provide a better design for obtaining artifacts… #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gnodet wants to merge 3 commits into from
Closed

[MNG-7157] [MNG-6843] Provide a better design for obtaining artifacts… #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
964fcc3
[MNG-6843] Use streams to implement access to artifacts and dependenc…
gnodet Jun 1, 2021
c46eaef
[MNG-6843] Parallel build fails due to missing JAR artifacts in compi…
gnodet Jun 2, 2021
6868a43
[MNG-7157] Provide a better design for obtaining artifacts from a Mav…
gnodet Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public void ensureDependenciesAreResolved( MojoDescriptor mojoDescriptor, MavenS
}
}

private ArtifactFilter getArtifactFilter( MojoDescriptor mojoDescriptor )
public static ArtifactFilter getArtifactFilter( MojoDescriptor mojoDescriptor )
{
String scopeToResolve = mojoDescriptor.getDependencyResolutionRequired();
String scopeToCollect = mojoDescriptor.getDependencyCollectionRequired();
Expand Down
31 changes: 31 additions & 0 deletions maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
import java.io.File;
import java.util.Properties;

import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.MojoExecutor;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
Expand Down Expand Up @@ -244,6 +246,10 @@ else if ( "mojoExecution".equals( expression ) )
{
value = mojoExecution;
}
else if ( "artifactFilter".equals( expression ) )
Copy link
Copy Markdown
Contributor

@rfscholte rfscholte Jun 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should investigate if we can solve this with MPLUGIN-302 instead of exposing this a new expression.

{
value = MojoExecutor.getArtifactFilter( mojoDescriptor );
}
else if ( "project".equals( expression ) )
{
value = project;
Expand All @@ -264,6 +270,31 @@ else if ( expression.startsWith( "project" ) || expression.startsWith( "pom" ) )
value = ReflectionValueExtractor.evaluate( pathExpression, project );
value = value + expression.substring( pathSeparator );
}
else if ( "project.artifacts".equals( expression ) )
{
ArtifactFilter filter = MojoExecutor.getArtifactFilter( mojoDescriptor );
value = project.getArtifacts( filter );
}
else if ( "project.artifactMap".equals( expression ) )
{
ArtifactFilter filter = MojoExecutor.getArtifactFilter( mojoDescriptor );
value = project.getArtifactMap( filter );
}
else if ( "project.compileClasspathElements".equals( expression ) )
{
ArtifactFilter filter = MojoExecutor.getArtifactFilter( mojoDescriptor );
value = project.getCompileClasspathElements( filter );
}
else if ( "project.runtimeClasspathElements".equals( expression ) )
{
ArtifactFilter filter = MojoExecutor.getArtifactFilter( mojoDescriptor );
value = project.getRuntimeClasspathElements( filter );
}
else if ( "project.testClasspathElements".equals( expression ) )
{
ArtifactFilter filter = MojoExecutor.getArtifactFilter( mojoDescriptor );
value = project.getTestClasspathElements( filter );
}
else
{
value = ReflectionValueExtractor.evaluate( expression.substring( 1 ), project );
Expand Down
1 change: 0 additions & 1 deletion maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ private DependencyResolutionResult resolveDependencies( MavenProject project, Re
}
}
project.setResolvedArtifacts( artifacts );
project.setArtifacts( artifacts );

return resolutionResult;
}
Expand Down
Loading