buildr 1.5.0.dev2-java → 1.5.0.dev3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5438d78f99dd8bccdf25bc60781ba7754e83846
-  data.tar.gz: 6105dcc8e0d7c2ae1e03a105804eb99a42a5723c
+  metadata.gz: c8fd4aea5cb30081c876d1f8a8a5ecac1c8dde96
+  data.tar.gz: 685692deb0f9a49f66c84e919b277b7bc7fe6d33
 SHA512:
-  metadata.gz: 24bef473b861ffdf13fa945f9956ec01e0762ace5adccb06fb1857b11afbfe5ad1b52894a1c65fab3ecdff435cc5bf416b8e9ba5881b1d81ead3ada47664e245
-  data.tar.gz: 4d15ce396ed9594916139ad78aebff1af8381291a0a3f1411bae99e6fc2702b1d33655641f3e90b58ec798abd0d7aee404c76e99fb80c8cc28786636f52e6e23
+  metadata.gz: e270fa90313485c7c4ead1f23c107af4c5eda6c80833ed9fb387b383351c73f7b779cb7c3cfb72c0e9cd75e1204d19a1e4918327dd44f080f6db827b881075f6
+  data.tar.gz: f53deeeaca383d7e470260812be7302ace9597d98728da4b169ce92087c99eade97a71de2e85297c875ad027b3cea87014170a32cc729765981d508a3d255a7f

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: java
 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