buildr 1.5.0.dev2 → 1.5.0.dev3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d1df22de3fbfb6b76cbe6090e33d359ec7a0f8c
-  data.tar.gz: 9cbf7a0bb27c129d30096fb7274d30e657868975
+  metadata.gz: 1fe13bb2bca219aff73958433c3fa62c1c3dde70
+  data.tar.gz: f242c732ab64df6d063cca47992f9c742141837d
 SHA512:
-  metadata.gz: 3cb8f7cf03652b17ac23a63894e90373e87e6ffdf28dcdf27ae2ca1f5c5f8ff38dda6ec67be567c2227b7e356474c5e38eb4c4dcb66ec2e5105177ee45810cbe
-  data.tar.gz: 1baed4682e42d280d8f50d103aa3956e95e0f011564ddc7a564f27c2f5ab55c4c70a26730d4a6ee4daf6a43369e526532a080a4b41aaae52e3f473a3f293e4d8
+  metadata.gz: 17fa7b736cb6adfbdb0b89fe673663fa0056d5e44a8320b76e7c2df49bf703a04bb59bc9f1a6936fb1cf4a6a9361eaff6c3aadeb6f2e812471ba1d923b9b3e11
+  data.tar.gz: 2162c7c765aea99e7bb417cc2faff29911e8c91f6f603f5eda04ea9a7364e4c2b155136dfee16e87f4d81afc0c4e42c61d6e626fea30367ac2d29b53b4ee5a14

data/addon/buildr/custom_pom.rb

@@ -213,7 +213,7 @@ module Buildr
             optional_deps = Buildr.artifacts(project.pom.optional_dependencies).collect { |d| d.to_s }
             deps =
               Buildr.artifacts(project.compile.dependencies).
-                select { |d| d.is_a?(Artifact) }.
+                select { |d| d.is_a?(ActsAsArtifact) }.
                 collect do |d|
                 f = d.to_s
                 scope = provided_deps.include?(f) ? 'provided' :
@@ -221,7 +221,7 @@ module Buildr
                     'compile'
                 d.to_hash.merge(:scope => scope, :optional => optional_deps.include?(f))
               end + Buildr.artifacts(project.test.compile.dependencies).
-                select { |d| d.is_a?(Artifact) && !project.compile.dependencies.include?(d) }.collect { |d| d.to_hash.merge(:scope => 'test') }
+                select { |d| d.is_a?(ActsAsArtifact) && !project.compile.dependencies.include?(d) }.collect { |d| d.to_hash.merge(:scope => 'test') }
             deps.each do |dependency|
               xml.dependency do
                 xml.groupId dependency[:group]

data/doc/more_stuff.textile

@@ -445,7 +445,7 @@ define 'myproject' do
   project.group = 'org.myproject'
   project.version = '1.0'
 
-  pom.add_apache2_license
+  pom.add_apache_v2_license
   pom.add_github_project('jbloggs/myproject')
   pom.add_developer('jbloggs', 'Joe Bloggs')
   pom.provided_dependencies.concat [:javax_servlet]

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.5.0.dev2'.freeze
+  VERSION = '1.5.0.dev3'.freeze
 end

data/spec/addon/custom_pom_spec.rb

@@ -156,6 +156,30 @@ describe Buildr::CustomPom do
       verify_dependency(@pom_xml, 'id-test', 'group', '1.0', 'test', nil)
     end
   end
+  
+  describe 'with a multi-module project' do
+    before do
+      write 'foo/src/main/java/Foo.java', 'public class Foo {}'
+      write 'bar/src/main/java/Bar.java', 'public class Bar {}'
+      define('myproject', :group => 'group', :version => '1.0') do
+        define('foo') do
+          package(:jar)
+        end
+        define(:bar) do
+          compile.with project('foo')
+          package(:jar)
+          pom.description = 'BAR Project'
+        end
+      end
+      task('package').invoke
+      
+      @pom_xml = project_pom_xml(project('myproject:bar'))
+    end
+    
+    it 'should add foo to the dependencies of bar\'s pom.xml' do
+      verify_dependency(@pom_xml, 'myproject-foo', 'group', '1.0', nil, nil)
+    end
+  end
 end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.0.dev2
+  version: 1.5.0.dev3
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake