You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/02/17 20:38:18 UTC
[50/50] [abbrv] maven git commit: [MNG-5868] Adding serval times the
same artifact via MavenProjectHelper (attachArtifact) does not produce a
failure
[MNG-5868] Adding serval times the same artifact via MavenProjectHelper (attachArtifact) does not produce a failure
o Updated to restore the behaviour consensus had been reached in MNG-5387.
o Kept 'MavenProject.getAttachedArtifacts' to return an unmodifiable list.
o Updated to log an information message when an existing artifact got replaced.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3b12cd67
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3b12cd67
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3b12cd67
Branch: refs/heads/MNG-5868
Commit: 3b12cd67c7be869cc15c51e2977f7b8f9235eedf
Parents: cd34b08
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Dec 17 22:43:47 2015 +0100
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Sat Feb 17 21:36:53 2018 +0100
----------------------------------------------------------------------
.../project/DefaultMavenProjectHelper.java | 13 +++----
.../org/apache/maven/project/MavenProject.java | 39 +++++++++++++++-----
2 files changed, 35 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3b12cd67/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
index 1972242..d65aa73 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
@@ -94,16 +94,15 @@ public class DefaultMavenProjectHelper
attachArtifact( project, artifact );
}
- /**
- * Add an attached artifact or replace the file for an existing artifact.
- *
- * @see MavenProject#addAttachedArtifact(org.apache.maven.artifact.Artifact)
- * @param project project reference.
- * @param artifact artifact to add or replace.
- */
public void attachArtifact( MavenProject project, Artifact artifact )
{
+ final int size = project.getAttachedArtifacts().size();
project.addAttachedArtifact( artifact );
+
+ if ( project.getAttachedArtifacts().size() == size && this.getLogger().isInfoEnabled() )
+ {
+ this.getLogger().info( String.format( "Replaced artifact %s.", artifact ) );
+ }
}
public void addResource( MavenProject project, String resourceDirectory, List<String> includes,
http://git-wip-us.apache.org/repos/asf/maven/blob/3b12cd67/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 80a5193..ba153a7 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -909,19 +909,38 @@ public class MavenProject
}
/**
- * Add or replace an artifact. This method is now deprecated. Use the @{MavenProjectHelper} to attach artifacts to a
- * project. In spite of the 'throws' declaration on this API, this method has never thrown an exception since Maven
- * 3.0.x. Historically, it logged and ignored a second addition of the same g/a/v/c/t. Now it replaces the file for
- * the artifact, so that plugins (e.g. shade) can change the pathname of the file for a particular set of
- * coordinates.
+ * Adds or replaces an artifact.
*
- * @param artifact the artifact to add or replace.
- * @throws DuplicateArtifactAttachmentException
+ * @param artifact The artifact to add or replace.
+ *
+ * @deprecated Please use {@link MavenProjectHelper}
+ * @see https://issues.apache.org/jira/browse/MNG-5868
+ * @see https://issues.apache.org/jira/browse/MNG-5387
+ * @see https://issues.apache.org/jira/browse/MNG-4013
+ * @see https://issues.apache.org/jira/browse/MNG-3119
*/
+ @Deprecated
public void addAttachedArtifact( Artifact artifact )
- throws DuplicateArtifactAttachmentException
{
- getAttachedArtifacts().add( artifact );
+ getAttachedArtifacts();
+ assert this.attachedArtifacts != null : "Unexpected missing attached artifacts.";
+
+ boolean replaced = false;
+ for ( int i = 0, s0 = this.attachedArtifacts.size(); i < s0; i++ )
+ {
+ final Artifact a = this.attachedArtifacts.get( i );
+
+ if ( a.equals( artifact ) )
+ {
+ this.attachedArtifacts.set( i, artifact );
+ replaced = true;
+ }
+ }
+
+ if ( !replaced )
+ {
+ this.attachedArtifacts.add( artifact );
+ }
}
public List<Artifact> getAttachedArtifacts()
@@ -930,7 +949,7 @@ public class MavenProject
{
attachedArtifacts = new ArrayList<>();
}
- return attachedArtifacts;
+ return Collections.unmodifiableList( attachedArtifacts );
}
public Xpp3Dom getGoalConfiguration( String pluginGroupId, String pluginArtifactId, String executionId,