Author: bimargulies
Date: Fri Jul 1 13:50:47 2011
New Revision: 1141937
URL: http://svn.apache.org/viewvc?rev=1141937&view=rev
Log:
[MSHADE-88]: antelder: fix an interaction between 'createDependencyReducedPom'
and
'promoteTransitiveDependencies'. also integration test. Also update to current
parent.
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/c/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/c/1/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/c/1/c-1.pom
Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1141937&r1=1141936&r2=1141937&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Fri Jul 1 13:50:47 2011
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>19</version>
+ <version>20</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml?rev=1141937&r1=1141936&r2=1141937&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml
(original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml Fri
Jul 1 13:50:47 2011
@@ -57,6 +57,12 @@ under the License.
<version>0.2</version>
<classifier>client</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.drp</groupId>
+ <artifactId>c</artifactId>
+ <version>1</version>
+ <type>pom</type>
+ </dependency>
</dependencies>
<build>
@@ -73,6 +79,8 @@ under the License.
<goal>shade</goal>
</goals>
<configuration>
+ <!-- allow testing that pom dependencies are omitted with p-t-d
-->
+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<shadedArtifactAttached>false</shadedArtifactAttached>
<createDependencyReducedPom>true</createDependencyReducedPom>
</configuration>
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/c/1/c-1.pom
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/c/1/c-1.pom?rev=1141937&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/c/1/c-1.pom
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/c/1/c-1.pom
Fri Jul 1 13:50:47 2011
@@ -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.drp</groupId>
+ <artifactId>c</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
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=1141937&r1=1141936&r2=1141937&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
Fri Jul 1 13:50:47 2011
@@ -757,6 +757,12 @@ public class ShadeMojo
{
Artifact artifact = (Artifact) it.next();
+ if ( "pom".equals( artifact.getType() ) )
+ {
+ // don't include pom type dependencies in dependency reduced pom
+ continue;
+ }
+
//promote
Dependency dep = new Dependency();
dep.setArtifactId( artifact.getArtifactId() );
