svn commit: r1389021 - in /buildr/trunk: CHANGELOG lib/buildr/packaging/artifact.rb spec/packaging/artifact_spec.rb

[do...@apache.org]

Author: donaldp
Date: Sun Sep 23 11:29:38 2012
New Revision: 1389021

URL: http://svn.apache.org/viewvc?rev=1389021&view=rev
Log:
BUILDR-606 Transitive artifact resolution should not include artifacts in 'provided' scope in poms to match maven behaviour. (Julio Arias)

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

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1389021&r1=1389020&r2=1389021&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Sep 23 11:29:38 2012
@@ -1,4 +1,6 @@
 1.4.8 (Pending)
+* Fixed:  BUILDR-606 Transitive artifact resolution should not include artifacts in 'provided' scope in poms to
+          match maven behaviour. (Julio Arias)
 * Change: BUILDR-640 Enable building jekyll and rdoc under more rubies. (Niklaus Giger)
 * Change: Mark Buildr:Bnd.remote_repository as deprecated as dependencies appear in maven central.
 * Added:  BUILDR-654 Add the ability to configure the version of BND used by bnd addon. (Niklaus Giger)

Modified: buildr/trunk/lib/buildr/packaging/artifact.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/artifact.rb?rev=1389021&r1=1389020&r2=1389021&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/artifact.rb (original)
+++ buildr/trunk/lib/buildr/packaging/artifact.rb Sun Sep 23 11:29:38 2012
@@ -814,7 +814,7 @@ module Buildr
   def transitive(*args)
     options = Hash === args.last ? args.pop : {}
     dep_opts = {
-      :scopes   => options[:scopes] || [nil, "compile", "runtime", "provided"],
+      :scopes   => options[:scopes] || [nil, "compile", "runtime"],
       :optional => options[:optional]
     }
     specs = args.flatten

Modified: buildr/trunk/spec/packaging/artifact_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/artifact_spec.rb?rev=1389021&r1=1389020&r2=1389021&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/artifact_spec.rb (original)
+++ buildr/trunk/spec/packaging/artifact_spec.rb Sun Sep 23 11:29:38 2012
@@ -1115,11 +1115,11 @@ XML
   end
 
   it 'should bring artifact and its dependencies' do
-    transitive(@complex).should eql(artifacts(@complex, @simple))
+    transitive(@complex).should eql(artifacts(@complex, @simple - [@provided]))
   end
 
   it 'should bring dependencies of POM without artifact itself' do
-    transitive(@complex.sub(/jar/, 'pom')).should eql(artifacts(@simple))
+    transitive(@complex.sub(/jar/, 'pom')).should eql(artifacts(@simple - [@provided]))
   end
 
   it 'should bring artifact and transitive depenencies' do