Author: jdcasey
Date: Wed Sep 22 20:56:09 2010
New Revision: 1000224
URL: http://svn.apache.org/viewvc?rev=1000224&view=rev
Log:
[MASSEMBLY-504][MASSEMBLY-337] Fixing file/directory mode in dependencySet when
unpack == true, and adding an integration test (currently dormant) for
MASSEMBLY-504.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/assembly/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/test.properties
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/resources/test.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1000224&r1=1000223&r2=1000224&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Sep 22 20:56:09 2010
@@ -130,7 +130,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -424,6 +424,7 @@ under the License.
<pomExclude>**/descriptor/pom.xml</pomExclude>
<pomExclude>**/handler-def/pom.xml</pomExclude>
<pomExclude>**/assembly/pom.xml</pomExclude>
+
<pomExclude>dependency-sets/depSet-transFromProfile/pom.xml</pomExclude>
</pomExcludes>
<postBuildHookScript>verify</postBuildHookScript>
</configuration>
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/pom.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/pom.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,16 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child1</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child3</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/test/App.java?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/test/App.java
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child1/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/pom.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/pom.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,19 @@
+<?xml version='1.0'?>
+<project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child2</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child3</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
+
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/assemble/bin.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/assemble/bin.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,23 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>bin</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>test:child1</include>
+ </includes>
+ <unpack>false</unpack>
+ <outputDirectory>lib</outputDirectory>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <scope>test</scope>
+ <excludes>
+ <exclude>junit:junit</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/test/App.java?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/test/App.java
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/pom.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/pom.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,9 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child3</artifactId>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/test/App.java?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/test/App.java
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child3/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/pom.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/pom.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,57 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child4</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>test</id>
+ <activation>
+ <property>
+ <name>test-profile</name>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <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>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/assembly/bin.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/assembly/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/assembly/bin.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <includes>
+ <include>test:child1</include>
+ </includes>
+ <excludes>
+ <exclude>test:child2</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/test/App.java?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/test/App.java
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/child4/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/goals.txt?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/goals.txt
Wed Sep 22 20:56:09 2010
@@ -0,0 +1 @@
+package
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/pom.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/pom.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ <module>child3</module>
+ <module>child4</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/test.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/test.properties?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/test.properties
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/test.properties
Wed Sep 22 20:56:09 2010
@@ -0,0 +1 @@
+test-profile=true
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh
Wed Sep 22 20:56:09 2010
@@ -0,0 +1 @@
+return new java.io.File( basedir,
"child4/target/child4-1.0-SNAPSHOT-bin/child3-1.0-SNAPSHOT.jar" ).exists();
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-transFromProfile/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/pom.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/pom.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,9 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child1</artifactId>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/resources/test.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/resources/test.txt?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/resources/test.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/resources/test.txt
Wed Sep 22 20:56:09 2010
@@ -0,0 +1 @@
+Test file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child1/src/main/resources/test.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/pom.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/pom.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,41 @@
+<?xml version='1.0'?>
+<project>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child2</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,20 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>test:child1</include>
+ </includes>
+ <unpack>true</unpack>
+ <outputDirectory>/${artifact.artifactId}</outputDirectory>
+ <fileMode>0444</fileMode>
+ <directoryMode>0555</directoryMode>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/test/App.java?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/test/App.java
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/pom.xml?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/pom.xml
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+
+ <!-- <properties><testVersion>2.2-beta-6-SNAPSHOT</testVersion></properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${testVersion}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build> -->
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh?rev=1000224&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh
Wed Sep 22 20:56:09 2010
@@ -0,0 +1,4 @@
+import java.io.*;
+
+File file = new File( basedir,
"child2/target/child2-1.0-SNAPSHOT-bin/child1/test.txt" );
+return file.exists() && file.canRead();
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
