Author: dennisl
Date: Sun Feb 20 17:42:25 2011
New Revision: 1072643
URL: http://svn.apache.org/viewvc?rev=1072643&view=rev
Log:
[MASSEMBLY-528] FileSet does not support filtering (again)
o I took the sample project provided by Marc Rohlfs and adapted it to an
integration test.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
(with props)
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/goals.txt?rev=1072643&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/goals.txt
Sun Feb 20 17:42:25 2011
@@ -0,0 +1,2 @@
+clean
+package
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml?rev=1072643&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
Sun Feb 20 17:42:25 2011
@@ -0,0 +1,39 @@
+<?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>
+
+ <artifactId>filters-defined-in-build</artifactId>
+ <packaging>pom</packaging>
+
+ <build>
+ <filters>
+ <filter>${basedir}/src/main/filters/filter-build.properties</filter>
+ </filters>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+
<descriptor>${basedir}/src/main/assembly/descriptor.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <id>single-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml?rev=1072643&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
Sun Feb 20 17:42:25 2011
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>assembly</id>
+
+ <formats>
+ <format>dir</format>
+ <format>zip</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/src/main/config</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/assembly/descriptor.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties?rev=1072643&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
Sun Feb 20 17:42:25 2011
@@ -0,0 +1,3 @@
+test.build.filter.props.1=${filter.build}
+test.assembly.filter.props.1=${filter.assembly}
+test.pom.props.1=${project.artifactId}-${project.version}.${project.packaging}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-1.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties?rev=1072643&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
Sun Feb 20 17:42:25 2011
@@ -0,0 +1,3 @@
+test.build.filter.props.2=${filter.build}
+test.assembly.filter.props.2=${filter.assembly}
+test.pom.props.2=${project.artifactId}-${project.version}.${project.packaging}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/config/file-2.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties?rev=1072643&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
Sun Feb 20 17:42:25 2011
@@ -0,0 +1 @@
+filter.assembly=Filter defined in the Assembly plugin's configuration.
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-assembly.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties?rev=1072643&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
Sun Feb 20 17:42:25 2011
@@ -0,0 +1 @@
+filter.build=Filter defined in the projects' build section.
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/src/main/filters/filter-build.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh?rev=1072643&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
Sun Feb 20 17:42:25 2011
@@ -0,0 +1,31 @@
+import java.io.*;
+import java.net.*;
+import java.util.jar.*;
+
+try
+{
+ File file = new File( basedir,
"target/filters-defined-in-build-1/file-1.properties");
+ BufferedReader r = new BufferedReader(new FileReader(file));
+ String s = r.readLine();
+ if(s.contains("filter.build"))
+ {
+ System.out.println("file-1.properties was not filtered");
+ return false;
+ }
+
+ file = new File( basedir,
"target/filters-defined-in-build-1/file-2.properties");
+ r = new BufferedReader(new FileReader(file));
+ s = r.readLine();
+ if(s.contains("filter.build"))
+ {
+ System.out.println("file-2.properties was not filtered");
+ return false;
+ }
+
+ return true;
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ return false;
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filters-defined-in-build/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
