Author: jdcasey
Date: Tue Sep 21 20:38:22 2010
New Revision: 999619
URL: http://svn.apache.org/viewvc?rev=999619&view=rev
Log:
[MASSEMBLY-206] IT verifying that fileSets within moduleSet/sources get
filtered correctly.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/src/assemble/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
(with props)
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/pom.xml?rev=999619&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/pom.xml
Tue Sep 21 20:38:22 2010
@@ -0,0 +1,12 @@
+<?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>test</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+ <name>Child</name>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt?rev=999619&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
Tue Sep 21 20:38:22 2010
@@ -0,0 +1 @@
+Java Version: ${java.version}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/src/config/a/filtered.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh?rev=999619&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh
Tue Sep 21 20:38:22 2010
@@ -0,0 +1,21 @@
+import java.io.*;
+
+try
+{
+ String javaVersion = System.getProperty( "java.version" );
+ File a = new File( basedir, "target/parent-1.0-bin/a/filtered.txt");
+
+ BufferedReader r = new BufferedReader(new FileReader(a));
+ String line = r.readLine();
+ if ( ! line.endsWith( javaVersion ) )
+ {
+ System.out.println( "Expected java version: " + javaVersion + "\nLine was:
" + line );
+ return false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+}
+
+return true;
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/child/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/pom.xml?rev=999619&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/pom.xml
Tue Sep 21 20:38:22 2010
@@ -0,0 +1,44 @@
+<?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>
+ <version>1.0</version>
+
+ <packaging>pom</packaging>
+ <name>Parent</name>
+
+ <modules>
+ <module>child</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/src/assemble/bin.xml?rev=999619&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/src/assemble/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/src/assemble/bin.xml
Tue Sep 21 20:38:22 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>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <moduleSets>
+ <moduleSet>
+ <sources>
+ <fileSets>
+ <fileSet>
+ <directory>src/config/a</directory>
+ <outputDirectory>a</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh?rev=999619&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
Tue Sep 21 20:38:22 2010
@@ -0,0 +1,21 @@
+import java.io.*;
+
+try
+{
+ String javaVersion = System.getProperty( "java.version" );
+ File a = new File( basedir, "target/parent-1.0-bin/child/a/filtered.txt");
+
+ BufferedReader r = new BufferedReader(new FileReader(a));
+ String line = r.readLine();
+ if ( ! line.endsWith( javaVersion ) )
+ {
+ System.out.println( "Expected java version: " + javaVersion + "\nLine was:
" + line );
+ return false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+}
+
+return true;
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
