Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 68509 invoked from network); 13 Jul 2007 12:24:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Jul 2007 12:24:36 -0000 Received: (qmail 77546 invoked by uid 500); 13 Jul 2007 12:24:36 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 77445 invoked by uid 500); 13 Jul 2007 12:24:36 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 77397 invoked by uid 99); 13 Jul 2007 12:24:35 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jul 2007 05:24:35 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jul 2007 05:24:32 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EE79A1A981A; Fri, 13 Jul 2007 05:24:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r555968 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/filtering-feature/ it/filtering-feature/filtersDefinedInAssemblyPluginConfig/ it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/ it/filtering-feature/filtersDefined... Date: Fri, 13 Jul 2007 12:24:11 -0000 To: commits@maven.apache.org From: bellingard@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070713122411.EE79A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bellingard Date: Fri Jul 13 05:24:10 2007 New Revision: 555968 URL: http://svn.apache.org/viewvc?view=rev&rev=555968 Log: [MASSEMBLY-226] Filters as read-only parameter can break the assembly build of a multi-module project Added: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/filter.properties (with props) maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt (with props) maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml (with props) maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/bin.xml (with props) maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/file.txt (with props) maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Added: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/filter.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/filter.properties?view=auto&rev=555968 ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/filter.properties (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/filter.properties Fri Jul 13 05:24:10 2007 @@ -0,0 +1 @@ +test.properties=foo Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/filter.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/filter.properties ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt?view=auto&rev=555968 ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt Fri Jul 13 05:24:10 2007 @@ -0,0 +1 @@ +org.apache.maven.plugins:maven-assembly-plugin:testing:assembly Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/goals.txt ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml?view=auto&rev=555968 ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml Fri Jul 13 05:24:10 2007 @@ -0,0 +1,32 @@ + + + 4.0.0 + org.test + parent + 1.0 + Parent + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + testing + + + src/assemble/bin.xml + + + filter.properties + + + + + + \ No newline at end of file Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/pom.xml ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/bin.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/bin.xml?view=auto&rev=555968 ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/bin.xml (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/bin.xml Fri Jul 13 05:24:10 2007 @@ -0,0 +1,14 @@ + + filtered-assembly + + dir + zip + + false + + + src/config/file.txt + true + + + Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/bin.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/assemble/bin.xml ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/file.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/file.txt?view=auto&rev=555968 ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/file.txt (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/file.txt Fri Jul 13 05:24:10 2007 @@ -0,0 +1 @@ +${test.properties} Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/file.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/src/config/file.txt ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh?view=auto&rev=555968 ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh Fri Jul 13 05:24:10 2007 @@ -0,0 +1,22 @@ +import java.io.*; +import java.net.*; +import java.util.jar.*; + +boolean result = true; + +try +{ + File file = new File( basedir, "target/parent-1.0-filtered-assembly.dir/file.txt"); + if(result) { + BufferedReader r = new BufferedReader(new FileReader(file)); + String s = r.readLine(); + result = s.equals("foo"); + } +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?view=diff&rev=555968&r1=555967&r2=555968 ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Fri Jul 13 05:24:10 2007 @@ -218,8 +218,7 @@ private MavenArchiveConfiguration archive; /** - * @parameter default-value="${project.build.filters}" - * @readonly + * @parameter */ protected List filters; @@ -412,6 +411,10 @@ public List getFilters() { + if ( filters == null ) + { + filters = getProject().getBuild().getFilters(); + } return filters; }