You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@buildr.apache.org by bo...@apache.org on 2012/05/29 18:16:35 UTC

svn commit: r1343812 - /buildr/trunk/lib/buildr/java/pom.rb

Author: boisvert
Date: Tue May 29 16:16:35 2012
New Revision: 1343812

URL: http://svn.apache.org/viewvc?rev=1343812&view=rev
Log:
Fix pom properties substitution on CRuby
(XML parser implementation can return multiple text nodes)

Modified:
    buildr/trunk/lib/buildr/java/pom.rb

Modified: buildr/trunk/lib/buildr/java/pom.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/pom.rb?rev=1343812&r1=1343811&r2=1343812&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/pom.rb (original)
+++ buildr/trunk/lib/buildr/java/pom.rb Tue May 29 16:16:35 2012
@@ -164,7 +164,8 @@ module Buildr
     # property substitution.
     def value_of(element, substitute = nil)
       value = element.to_a.join.strip
-      substitute ? value.gsub(/\$\{([^}]+)\}/) { |key| substitute[$1] } : value
+      value = value.gsub(/\$\{([^}]+)\}/) { |key| Array(substitute[$1]).join.strip } if substitute
+      value
     end
 
     # :call-seq: