|
 |
0ed1b60 |
From 2464fdd561a5c91adb23ef41b736baca5d2e8c61 Mon Sep 17 00:00:00 2001
|
|
|
16c8bd4 |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
16c8bd4 |
Date: Tue, 9 Sep 2014 15:26:16 +0200
|
|
|
27e6857 |
Subject: [PATCH 1/5] Avoid installing the same attached artifact twice
|
|
|
16c8bd4 |
|
|
|
16c8bd4 |
---
|
|
|
16c8bd4 |
xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java | 5 ++++-
|
|
|
16c8bd4 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
16c8bd4 |
|
|
|
16c8bd4 |
diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java
|
|
|
16c8bd4 |
index 28c9231..4018777 100644
|
|
|
16c8bd4 |
--- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java
|
|
|
16c8bd4 |
+++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java
|
|
|
16c8bd4 |
@@ -213,9 +213,12 @@ public class InstallMojo
|
|
|
16c8bd4 |
rawPomArtifact = rawPomArtifact.setPath( rawPomPath );
|
|
|
16c8bd4 |
deployArtifact( rawPomArtifact, type, project.getModel() );
|
|
|
16c8bd4 |
|
|
|
16c8bd4 |
+ Set<Artifact> attachedArtifacts = new LinkedHashSet<>();
|
|
|
16c8bd4 |
for ( org.apache.maven.artifact.Artifact mavenArtifact : project.getAttachedArtifacts() )
|
|
|
16c8bd4 |
+ attachedArtifacts.add( aetherArtifact( mavenArtifact ) );
|
|
|
16c8bd4 |
+
|
|
|
16c8bd4 |
+ for ( Artifact attachedArtifact : attachedArtifacts )
|
|
|
16c8bd4 |
{
|
|
|
16c8bd4 |
- Artifact attachedArtifact = aetherArtifact( mavenArtifact );
|
|
|
16c8bd4 |
Path attachedArtifactPath = attachedArtifact.getPath();
|
|
|
16c8bd4 |
logger.debug( "Installing attached artifact {}", attachedArtifact );
|
|
|
16c8bd4 |
logger.debug( "Artifact file is {}", attachedArtifactPath );
|
|
|
16c8bd4 |
--
|
|
|
16c8bd4 |
1.9.3
|
|
|
16c8bd4 |
|