Author: jdcasey
Date: Fri Sep 12 15:30:38 2008
New Revision: 694822
URL: http://svn.apache.org/viewvc?rev=694822&view=rev
Log:
[MASSEMBLY-287] Enable skipAssembly parameter to be triggered from the command
line.
Integration test submitted by: Petar Tahchiev
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/assembly/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/goals.txt?rev=694822&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/goals.txt
Fri Sep 12 15:30:38 2008
@@ -0,0 +1 @@
+package
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml?rev=694822&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml
Fri Sep 12 15:30:38 2008
@@ -0,0 +1,37 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>skipAssemblyCLIPropertySet</artifactId>
+ <packaging>pom</packaging>
+ <version>1</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/assembly/bin.xml?rev=694822&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/assembly/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/assembly/bin.xml
Fri Sep 12 15:30:38 2008
@@ -0,0 +1,13 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties?rev=694822&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties
Fri Sep 12 15:30:38 2008
@@ -0,0 +1 @@
+skipAssembly=true
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh?rev=694822&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh
Fri Sep 12 15:30:38 2008
@@ -0,0 +1,8 @@
+import java.io.*;
+import java.util.jar.*;
+import java.util.*;
+import java.net.*;
+
+File file = new File( basedir, "target/skipAssemblyCLIPropertySet-1.zip" );
+
+return !file.exists();
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=694822&r1=694821&r2=694822&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Fri Sep 12 15:30:38 2008
@@ -56,7 +56,7 @@
* as skipped for a particular build. This makes the assembly plugin more
controllable
* from profiles.
*
- * @parameter default-value="false"
+ * @parameter expression="${skipAssembly}" default-value="false"
*/
private boolean skipAssembly;
