svn commit: r1529720 - in /buildr/trunk: CHANGELOG lib/buildr/packaging/artifact.rb

[do...@apache.org]

Author: donaldp
Date: Sun Oct  6 23:57:52 2013
New Revision: 1529720

URL: http://svn.apache.org/r1529720
Log:
Fixed regression using transitive dependencies due to presence of :scope option in Artifacts.to_hash.

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/packaging/artifact.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1529720&r1=1529719&r2=1529720&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Oct  6 23:57:52 2013
@@ -1,4 +1,6 @@
 1.4.14 (Pending)
+* Fixed:  Fixed regression using transitive dependencies due to
+          presence of :scope option in Artifacts.to_hash.
 * Fixed:  Fixed bug in GWT addon that required that the user supply
           the :dependencies option.
 * Fixed:  Fixed bug in Intellij project file generation when adding

Modified: buildr/trunk/lib/buildr/packaging/artifact.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/artifact.rb?rev=1529720&r1=1529719&r2=1529720&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/artifact.rb (original)
+++ buildr/trunk/lib/buildr/packaging/artifact.rb Sun Oct  6 23:57:52 2013
@@ -293,7 +293,7 @@ module Buildr #:nodoc:
         if spec.respond_to?(:to_spec)
           to_hash spec.to_spec
         elsif Hash === spec
-          rake_check_options spec, :id, :group, :type, :classifier, :version
+          rake_check_options spec, :id, :group, :type, :classifier, :version, :scope
           # Sanitize the hash and check it's valid.
           spec = ARTIFACT_ATTRIBUTES.inject({}) { |h, k| h[k] = spec[k].to_s if spec[k] ; h }
           fail "Missing group identifier for #{spec.inspect}" unless spec[:group]