svn commit: r657997 - in /incubator/buildr/trunk: buildr.gemspec lib/buildr/java/pom.rb

[as...@apache.org]

Author: assaf
Date: Mon May 19 14:49:45 2008
New Revision: 657997

URL: http://svn.apache.org/viewvc?rev=657997&view=rev
Log:
Fix to the previous fix that didn't quite fix the problem.
Fix to version number in buildr.gemspec.

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

Modified: incubator/buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/buildr.gemspec?rev=657997&r1=657996&r2=657997&view=diff
==============================================================================
--- incubator/buildr/trunk/buildr.gemspec (original)
+++ incubator/buildr/trunk/buildr.gemspec Mon May 19 14:49:45 2008
@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr'
-  spec.version        = '1.3.0'
+  spec.version        = '1.3.1'
   spec.author         = 'Apache Buildr'
   spec.email          = "#{spec.name}-user@incubator.apache.org"
   spec.homepage       = "http://incubator.apache.org/#{spec.name}/"

Modified: incubator/buildr/trunk/lib/buildr/java/pom.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/pom.rb?rev=657997&r1=657996&r2=657997&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/pom.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/pom.rb Mon May 19 14:49:45 2008
@@ -71,7 +71,7 @@
 
     def initialize(xml) #:nodoc:
       @project = XmlSimple.xml_in(xml)
-      @parent = POM.load(pom_to_hash(project["parent"].first, properties).merge(:type=>'pom'))
+      @parent = POM.load(pom_to_hash(project["parent"].first).merge(:type=>'pom')) if project['parent']
     end
 
     # :call-seq: