Skip to content

[MDEPLOY-312] - merge resolved artifacts back into project model #44

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
jaredstehler wants to merge 1 commit into from
Closed

[MDEPLOY-312] - merge resolved artifacts back into project model #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 44 additions & 1 deletion src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,22 @@
*/
package org.apache.maven.plugins.deploy;

import java.util.Objects;
import java.util.Optional;

import org.apache.maven.RepositoryUtils;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.rtinfo.RuntimeInformation;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.deployment.DeployRequest;
import org.eclipse.aether.deployment.DeployResult;
import org.eclipse.aether.deployment.DeploymentException;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.util.version.GenericVersionScheme;
Expand Down Expand Up @@ -136,7 +143,8 @@ protected void deploy(DeployRequest deployRequest) throws MojoExecutionException
getLog().info("Retrying deployment attempt " + (count + 1) + " of " + retryFailedDeploymentCounter);
}

repositorySystem.deploy(session.getRepositorySession(), deployRequest);
DeployResult deployResult = repositorySystem.deploy(session.getRepositorySession(), deployRequest);
mergeResolvedArtifacts(deployResult);
exception = null;
break;
} catch (DeploymentException e) {
Expand All @@ -153,4 +161,39 @@ protected void deploy(DeployRequest deployRequest) throws MojoExecutionException
throw new MojoExecutionException(exception.getMessage(), exception);
}
}

protected void mergeResolvedArtifacts(DeployResult deployResult) {
for (Artifact resolvedArtifact : deployResult.getArtifacts()) {
Optional<MavenProject> projectMaybe = session.getAllProjects().stream()
.filter(p -> Objects.equals(resolvedArtifact.getGroupId(), p.getGroupId())
&& Objects.equals(resolvedArtifact.getArtifactId(), p.getArtifactId()))
.findFirst();

if (projectMaybe.isPresent()) {
MavenProject project = projectMaybe.get();

if (isMatch(resolvedArtifact, project.getArtifact())) {
project.setArtifact(RepositoryUtils.toArtifact(resolvedArtifact));
} else {
for (int i = 0; i < project.getAttachedArtifacts().size(); i++) {
if (isMatch(
resolvedArtifact, project.getAttachedArtifacts().get(i))) {
project.getAttachedArtifacts().set(i, RepositoryUtils.toArtifact(resolvedArtifact));
break;
}
}
}
}
}
}

private static boolean isMatch(Artifact a, org.apache.maven.artifact.Artifact modelArtifact) {
return Objects.equals(modelArtifact.getGroupId(), a.getGroupId())
&& Objects.equals(modelArtifact.getArtifactId(), a.getArtifactId())
&& Objects.equals(
modelArtifact.getType(),
Optional.ofNullable(a.getProperties().get("type")).orElse(null))
&& Objects.equals(
Optional.ofNullable(modelArtifact.getClassifier()).orElse(""), a.getClassifier());
}
}
5 changes: 4 additions & 1 deletion src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.eclipse.aether.artifact.ArtifactType;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.deployment.DeployRequest;
import org.eclipse.aether.deployment.DeployResult;
import org.eclipse.aether.deployment.DeploymentException;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.util.artifact.SubArtifact;
Expand Down Expand Up @@ -373,7 +374,9 @@ public void execute() throws MojoExecutionException, MojoFailureException {
}

try {
repositorySystem.deploy(session.getRepositorySession(), deployRequest);
DeployResult deployResult = repositorySystem.deploy(session.getRepositorySession(), deployRequest);
mergeResolvedArtifacts(deployResult);

} catch (DeploymentException e) {
throw new MojoExecutionException(e.getMessage(), e);
} finally {
Expand Down