You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/05/03 12:54:58 UTC
svn commit: r940415 - in
/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path:
./ assembly.xml component.xml goals.txt pom.xml verify.bsh
Author: bentmann
Date: Mon May 3 10:54:58 2010
New Revision: 940415
URL: http://svn.apache.org/viewvc?rev=940415&view=rev
Log:
[MASSEMBLY-486] ComponentDescriptors to support absolute paths
o Added IT
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh (with props)
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml?rev=940415&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml Mon May 3 10:54:58 2010
@@ -0,0 +1,13 @@
+<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>filtered-assembly</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+ <!-- Needs to be interpolated before actual resolution -->
+ <componentDescriptor>${project.basedir}/component.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml?rev=940415&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml Mon May 3 10:54:58 2010
@@ -0,0 +1,7 @@
+<component>
+ <files>
+ <file>
+ <source>pom.xml</source>
+ </file>
+ </files>
+</component>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt?rev=940415&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt Mon May 3 10:54:58 2010
@@ -0,0 +1 @@
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml?rev=940415&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml Mon May 3 10:54:58 2010
@@ -0,0 +1,35 @@
+<?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>org.test</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ <name>Test</name>
+
+ <!--
+ Verify that the <componentDescriptor> elements of an assembly descriptor get interpolated before resolution
+ of the component descriptor is attempted (MASSEMBLY-486).
+ -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh?rev=940415&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh Mon May 3 10:54:58 2010
@@ -0,0 +1,9 @@
+import java.io.*;
+
+File file = new File( basedir, "target/test-1.0-filtered-assembly/pom.xml" );
+if ( !file.isFile() )
+{
+ throw new IllegalStateException( "Missing: " + file );
+}
+
+return true;
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision