Author: assaf
Date: Mon May 19 13:05:52 2008
New Revision: 657953
URL: http://svn.apache.org/viewvc?rev=657953&view=rev
Log:
BUILDR-63 Possible fix.
Modified:
incubator/buildr/trunk/CHANGELOG
incubator/buildr/trunk/lib/buildr/java/pom.rb
Modified: incubator/buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=657953&r1=657952&r2=657953&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Mon May 19 13:05:52 2008
@@ -12,6 +12,7 @@
* Fixed: BUILDR-75 Filter now runs if there's a target directory, even if
there are no source files to copy over, since everyone else just checks
resources.target for existence before depending on it.
+* Fixed: BUILDR-63 Possible fix.
1.3.0 (2008-04-25)
* Added: Testing with EasyB (Nicolas Modrzyk).
Modified: incubator/buildr/trunk/lib/buildr/java/pom.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/pom.rb?rev=657953&r1=657952&r2=657953&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/pom.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/pom.rb Mon May 19 13:05:52 2008
@@ -71,7 +71,7 @@
def initialize(xml) #:nodoc:
@project = XmlSimple.xml_in(xml)
- @parent = POM.load(pom_to_hash(project["parent"].first)) if
project["parent"]
+ @parent = POM.load(pom_to_hash(project["parent"].first,
properties).merge(:type=>'pom'))
end
# :call-seq:
