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 2015/07/06 22:17:26 UTC
svn commit: r1689490 -
/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Author: khmarbaise
Date: Mon Jul 6 20:17:25 2015
New Revision: 1689490
URL: http://svn.apache.org/r1689490
Log:
[MSHADE-148] Shade Plugin gets stuck in infinite loop building dependency reduced POM
Patch of Tom White applied.
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1689490&r1=1689489&r2=1689490&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Mon Jul 6 20:17:25 2015
@@ -1139,7 +1139,9 @@ public class ShadeMojo
for ( Dependency dep : transitiveDeps )
{
if ( dep.getArtifactId().equals( n3.getArtifact().getArtifactId() )
- && dep.getGroupId().equals( n3.getArtifact().getGroupId() ) )
+ && dep.getGroupId().equals( n3.getArtifact().getGroupId() )
+ && ( dep.getType() == null ||
+ dep.getType().equals( n3.getArtifact().getType() ) ) )
{
found = true;
break;
@@ -1151,7 +1153,9 @@ public class ShadeMojo
for ( Dependency dep : dependencies )
{
if ( dep.getArtifactId().equals( n2.getArtifact().getArtifactId() )
- && dep.getGroupId().equals( n2.getArtifact().getGroupId() ) )
+ && dep.getGroupId().equals( n2.getArtifact().getGroupId() )
+ && ( dep.getType() == null ||
+ dep.getType().equals( n2.getArtifact().getType() ) ) )
{
Exclusion exclusion = new Exclusion();
exclusion.setArtifactId( n3.getArtifact().getArtifactId() );