MSHADE-124: Need better plan for getting dependency-reduced-pom.xml o…

…ut of basedir o add integration test for new unique name generator. git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1379508 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 31, 2012 · c96e2a0 · c96e2a0
1 parent 635e9a8
commit c96e2a0
Show file tree

Hide file tree

Showing 8 changed files with 252 additions and 2 deletions.
diff --git a/src/it/dep-reduced-pom-unique/pom.xml b/src/it/dep-reduced-pom-unique/pom.xml
@@ -0,0 +1,101 @@
+<?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>test</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>MSHADE-53</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.drp</groupId>
+            <artifactId>a</artifactId>
+            <version>0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.its.shade.drp</groupId>
+            <artifactId>b</artifactId>
+            <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>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>@project.version@</version>
+                <executions>
+                    <execution>
+                        <id>shade</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <generateUniqueDependencyReducedPom>true</generateUniqueDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>properties-maven-plugin</artifactId>
+              <version>1.0-alpha-2</version>
+              <executions>
+                <execution>
+                  <goals>
+                    <goal>write-project-properties</goal>
+                  </goals>
+                  <phase>package</phase>
+                  <configuration>
+                    <outputFile>target/project.properties</outputFile>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/it/dep-reduced-pom-unique/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.jar b/src/it/dep-reduced-pom-unique/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.jar
diff --git a/src/it/dep-reduced-pom-unique/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.pom b/src/it/dep-reduced-pom-unique/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.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.drp</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>
+</project>
diff --git a/src/it/dep-reduced-pom-unique/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2-client.jar b/src/it/dep-reduced-pom-unique/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2-client.jar
diff --git a/src/it/dep-reduced-pom-unique/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2.pom b/src/it/dep-reduced-pom-unique/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2.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.drp</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>
+</project>
diff --git a/src/it/dep-reduced-pom-unique/repo/org/apache/maven/its/shade/drp/c/1/c-1.pom b/src/it/dep-reduced-pom-unique/repo/org/apache/maven/its/shade/drp/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.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>
diff --git a/src/it/dep-reduced-pom-unique/verify.groovy b/src/it/dep-reduced-pom-unique/verify.groovy
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+import java.io.*;
+import java.util.Properties;
+
+def drps = basedir.listFiles( { dir, file -> file ==~ "dependency-reduced-.*\\.xml" } as FilenameFilter )
+
+File pomFile = drps[0]
+
+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() == 0
+
+def props = new File( basedir, "target/project.properties" )
+Properties properties = new Properties();
+FileInputStream inp = new FileInputStream( props );
+properties.load( inp );
+inp.close();
+
+assert properties["maven.shade.dependency-reduced-pom"] != null
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
@@ -301,7 +301,7 @@ public class ShadeMojo
      *
      * @since 1.7.2
      */
-    @Parameter
+    @Parameter( defaultValue = "false" )
     private boolean generateUniqueDependencyReducedPom;
 
     /**
@@ -880,7 +880,7 @@ private void createDependencyReducedPom( Set<String> artifactsToRemove )
 
                 if ( generateUniqueDependencyReducedPom )
                 {
-                    dependencyReducedPomLocation = File.createTempFile( "dependency-reduced-pom", "xml", project.getBasedir() );
+                    dependencyReducedPomLocation = File.createTempFile( "dependency-reduced-pom-", ".xml", project.getBasedir() );
                     project.getProperties().setProperty( "maven.shade.dependency-reduced-pom", dependencyReducedPomLocation.getAbsolutePath() );
                 }
                 else
@@ -893,6 +893,8 @@ private void createDependencyReducedPom( Set<String> artifactsToRemove )
                 }
 
                 File f = dependencyReducedPomLocation;
+                getLog().info( "Dependency-reduced POM written at: " + f.getAbsolutePath() );
+
                 if ( f.exists() )
                 {
                     f.delete();