lib/buildr/ivy_extension.rb in ivy4r-0.9.4 vs lib/buildr/ivy_extension.rb in ivy4r-0.9.5

@@ -546,10 +546,10 @@
         def add_manifest_to_distributeables(project)
           pkgs = project.packages.find_all { |pkg| [:jar, :war, :ear].member? pkg.type }
           pkgs.each do |pkg|
             name = "#{pkg.name}manifest"
             task = project.task name => project.ivy.file_project.task('ivy:resolve') do
-              pkg.with :manifest => project.manifest.merge(project.ivy.manifest)
+              pkg.with :manifest => pkg.manifest.merge(project.manifest.merge(project.ivy.manifest))
               info "Adding manifest entries to package '#{pkg.name}'"
             end
             project.task :build => task
           end
         end