- Endless processing with promoteTransitiveDependencies
Fix the endless processing that was caused by not checking the
classifier of the dependencies when adding excludes.
diff --git a/src/it/dep-reduced-pom-exclusions/invoker.properties b/src/it/dep-reduced-pom-exclusions/invoker.properties
new file mode 100644
index 0000000..9bbad67
--- /dev/null
+++ b/src/it/dep-reduced-pom-exclusions/invoker.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.timeoutInSeconds=60
\ No newline at end of file
diff --git a/src/it/dep-reduced-pom-exclusions/pom.xml b/src/it/dep-reduced-pom-exclusions/pom.xml
new file mode 100644
index 0000000..de4f1a6
--- /dev/null
+++ b/src/it/dep-reduced-pom-exclusions/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.drpe</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>MSHADE-223</name>
+ <description>
+ Test that creation of the dependency reduced POM properly handles dependencies with classifiers.
+ </description>
+
+ <repositories>
+ <repository>
+ <id>shade-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.drpe</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven.its.shade.drpe</groupId>
+ <artifactId>c</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>attach-shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <shadedArtifactAttached>false</shadedArtifactAttached>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <artifactSet>
+ <includes>
+ <include>org.apache.maven.its.shade.drpe:a</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.jar b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.jar
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.jar
Binary files differ
diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.pom b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.pom
new file mode 100644
index 0000000..87e14f6
--- /dev/null
+++ b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.pom
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.drpe</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.drpe</groupId>
+ <artifactId>b</artifactId>
+ <version>0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.drpe</groupId>
+ <artifactId>b</artifactId>
+ <classifier>alt</classifier>
+ <version>0.2</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2-alt.jar b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2-alt.jar
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2-alt.jar
Binary files differ
diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.jar b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.jar
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.jar
Binary files differ
diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.pom b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.pom
new file mode 100644
index 0000000..4ecb2a3
--- /dev/null
+++ b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.pom
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.drpe</groupId>
+ <artifactId>b</artifactId>
+ <version>0.2</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.drpe</groupId>
+ <artifactId>c</artifactId>
+ <version>1</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.jar b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.jar
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.jar
Binary files differ
diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.pom b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.pom
new file mode 100644
index 0000000..3a40bf4
--- /dev/null
+++ b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.pom
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.drpe</groupId>
+ <artifactId>c</artifactId>
+ <version>1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
diff --git a/src/it/dep-reduced-pom-exclusions/verify.groovy b/src/it/dep-reduced-pom-exclusions/verify.groovy
new file mode 100644
index 0000000..2765519
--- /dev/null
+++ b/src/it/dep-reduced-pom-exclusions/verify.groovy
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File pomFile = new File( basedir, "dependency-reduced-pom.xml" )
+assert pomFile.isFile()
+
+def ns = new groovy.xml.Namespace("http://maven.apache.org/POM/4.0.0")
+def pom = new XmlParser().parse( pomFile )
+
+assert pom[ns.modelVersion].size() == 1
+assert pom[ns.dependencies][ns.dependency].size() == 2
+assert pom[ns.dependencies][ns.dependency][0][ns.exclusions][ns.exclusion].size() == 1
+assert pom[ns.dependencies][ns.dependency][1][ns.exclusions][ns.exclusion].size() == 1
diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
index 07a8b8d..fa5f42b 100644
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
@@ -1252,9 +1252,7 @@
boolean found = false;
for ( Dependency dep : transitiveDeps )
{
- if ( dep.getArtifactId().equals( n3.getArtifact().getArtifactId() ) //
- && dep.getGroupId().equals( n3.getArtifact().getGroupId() ) //
- && ( dep.getType() == null || dep.getType().equals( n3.getArtifact().getType() ) ) )
+ if ( getId( dep ).equals( getId( n3.getArtifact() ) ) )
{
found = true;
break;
@@ -1269,9 +1267,7 @@
{
for ( Dependency dep : dependencies )
{
- if ( dep.getArtifactId().equals( n2.getArtifact().getArtifactId() ) //
- && dep.getGroupId().equals( n2.getArtifact().getGroupId() ) //
- && ( dep.getType() == null || dep.getType().equals( n2.getArtifact().getType() ) ) )
+ if ( getId( dep ).equals( getId( n2.getArtifact() ) ) )
{
Exclusion exclusion = new Exclusion();
exclusion.setArtifactId( n3.getArtifact().getArtifactId() );
