Author: jdcasey
Date: Wed Sep 22 23:13:59 2010
New Revision: 1000271
URL: http://svn.apache.org/viewvc?rev=1000271&view=rev
Log:
[MASSEMBLY-498] Allow the use of ${artifact.properties.*} in dependencySets,
and ${module.properties.*} in moduleSets to specify outputDirectory and
outputFileNameMapping paths."
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/assembly-resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/assembly-resources/test.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/assembly-resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/assembly-resources/test.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1000271&r1=1000270&r2=1000271&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Sep 22 23:13:59 2010
@@ -419,6 +419,9 @@ under the License.
<!-- This will be handled by the parent in the
bugs/massembly-285 dir. -->
<pomExclude>bugs/massembly-285/massembly-285-*/pom.xml</pomExclude>
+
<pomExclude>dependency-sets/depSet-enum-vs-wildcard/enum/pom.xml</pomExclude>
+
<pomExclude>dependency-sets/depSet-enum-vs-wildcard/wildcard/pom.xml</pomExclude>
+
<pomExclude>**/child*/pom.xml</pomExclude>
<pomExclude>**/module*/pom.xml</pomExclude>
<pomExclude>**/descriptor/pom.xml</pomExclude>
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml
Wed Sep 22 23:13:59 2010
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1</version>
+ </parent>
+ <artifactId>child1</artifactId>
+
+ <properties>
+ <foo>bar</foo>
+ </properties>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/assembly-resources/test.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/assembly-resources/test.txt?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/assembly-resources/test.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/assembly-resources/test.txt
Wed Sep 22 23:13:59 2010
@@ -0,0 +1 @@
+Project Version: ${project.version}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child1/src/main/resources/assembly-resources/test.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/pom.xml
Wed Sep 22 23:13:59 2010
@@ -0,0 +1,41 @@
+<?xml version='1.0'?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1</version>
+ </parent>
+ <artifactId>child2</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <version>1</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-artifactPomPropInterp/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml
Wed Sep 22 23:13:59 2010
@@ -0,0 +1,17 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>test:child1</include>
+ </includes>
+ <outputDirectory>${artifact.properties.foo}</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml
Wed Sep 22 23:13:59 2010
@@ -0,0 +1,19 @@
+<?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</version>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh
Wed Sep 22 23:13:59 2010
@@ -0,0 +1,4 @@
+import java.io.*;
+
+File f = new File( basedir, "child2/target/child2-1-bin/bar/child1-1.jar" );
+return f.exists() && f.isFile();
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-artifactPomPropInterp/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/pom.xml?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/pom.xml
Wed Sep 22 23:13:59 2010
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1</version>
+ </parent>
+ <artifactId>child1</artifactId>
+
+ <properties>
+ <foo>bar</foo>
+ </properties>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/assembly-resources/test.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/assembly-resources/test.txt?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/assembly-resources/test.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/assembly-resources/test.txt
Wed Sep 22 23:13:59 2010
@@ -0,0 +1 @@
+Project Version: ${project.version}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child1/src/main/resources/assembly-resources/test.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/pom.xml?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/pom.xml
Wed Sep 22 23:13:59 2010
@@ -0,0 +1,41 @@
+<?xml version='1.0'?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>test</groupId>
+ <version>1</version>
+ </parent>
+ <artifactId>child2</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <version>1</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/multimodule/multimodule-modulePomPropInterp/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/assemble/bin.xml?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/assemble/bin.xml
Wed Sep 22 23:13:59 2010
@@ -0,0 +1,26 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+
+ <includes>
+ <include>test:child1</include>
+ </includes>
+ <binaries>
+
<outputDirectory>${module.properties.foo}/${module.artifactId}</outputDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>true</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/pom.xml?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/pom.xml
Wed Sep 22 23:13:59 2010
@@ -0,0 +1,19 @@
+<?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</version>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh?rev=1000271&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh
Wed Sep 22 23:13:59 2010
@@ -0,0 +1,4 @@
+import java.io.*;
+
+File f = new File( basedir, "child2/target/child2-1-bin/bar/child1" );
+return f.exists() && f.isDirectory();
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-modulePomPropInterp/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=1000271&r1=1000270&r2=1000271&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
Wed Sep 22 23:13:59 2010
@@ -149,6 +149,8 @@ public final class AssemblyFormatUtils
{
// 2
interpolator.addValueSource( new PrefixedObjectValueSource(
"module.", moduleProject ) );
+ interpolator.addValueSource( new PrefixedPropertiesValueSource(
"module.properties.",
+
moduleProject.getProperties() ) );
if ( moduleProject.getArtifact() != null )
{
interpolator.addValueSource( new PrefixedObjectValueSource(
"module.", moduleProject.getArtifact() ) );
@@ -159,6 +161,8 @@ public final class AssemblyFormatUtils
{
// 3
interpolator.addValueSource( new PrefixedObjectValueSource(
"artifact.", artifactProject ) );
+ interpolator.addValueSource( new PrefixedPropertiesValueSource(
"artifact.properties.",
+
artifactProject.getProperties() ) );
if ( artifactProject.getArtifact() != null )
{
interpolator.addValueSource( new PrefixedObjectValueSource(
"artifact.", artifactProject.getArtifact() ) );
@@ -345,6 +349,8 @@ public final class AssemblyFormatUtils
if ( moduleProject != null )
{
interpolator.addValueSource( new PrefixedObjectValueSource(
"module.", moduleProject ) );
+ interpolator.addValueSource( new PrefixedPropertiesValueSource(
"module.properties.",
+
moduleProject.getProperties() ) );
if ( moduleProject.getArtifact() != null )
{
interpolator.addValueSource( new PrefixedObjectValueSource(
"module.", moduleProject.getArtifact() ) );
@@ -362,6 +368,8 @@ public final class AssemblyFormatUtils
if ( artifactProject != null )
{
interpolator.addValueSource( new PrefixedObjectValueSource(
"artifact.", artifactProject ) );
+ interpolator.addValueSource( new PrefixedPropertiesValueSource(
"artifact.properties.",
+
artifactProject.getProperties() ) );
if ( artifactProject.getArtifact() != null )
{
interpolator.addValueSource( new PrefixedObjectValueSource(
"artifact.", artifactProject.getArtifact() ) );
