ivy4r 0.12.1 → 0.12.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.12.2 / 2010-10-19
+  * Removed use of "facets/blank" using now "empty?" did not find the use when removing the require
+  * Add fix for error while merging additional infos into manifest files. Some jars, ears or wars do not have a manifest no just do nothing.
+
 === 0.12.1 / 2010-10-13
   * Use [project target dir]/pom.xml as default name for generated POM files.
   * Works with MRI and JRuby

data/lib/buildr/ivy_extension.rb

@@ -114,7 +114,7 @@ module Buildr
         end
         
         [confs, types].each do |t|
-          t.reject! {|c| c.nil? || c.blank? }
+          t.reject! {|c| c.nil? || c.empty? }
         end
         
         unless confs.empty?
@@ -413,7 +413,7 @@ module Buildr
         if artifacts
           artifacts = artifacts.find_all do |lib|
             lib = File.basename(lib)
-            includes = includes.reject {|i| i.nil? || i.blank? }
+            includes = includes.reject {|i| i.nil? || i.empty? }
             should_include = includes.empty? || includes.any? {|include| include === lib }
             should_include && !excludes.any? {|exclude| exclude === lib}
           end
@@ -603,8 +603,12 @@ module IvyExtension
       pkgs.each do |pkg|
         name = "#{pkg.name}manifest"
         task = project.task name => project.ivy.file_project.task('ivy:resolve') do
-          pkg.with :manifest => pkg.manifest.merge(project.manifest.merge(project.ivy.manifest))
-          info "Adding manifest entries to package '#{pkg.name}'"
+          if pkg.manifest # source jars have no manifest, only add to existing manifest files
+            pkg.with :manifest => pkg.manifest.merge(project.manifest.merge(project.ivy.manifest))
+            info "Adding manifest entries to package '#{pkg.name}'"
+          else
+            info "Could not merge info to package '#{pkg.to_s}' it has no manifest!"
+          end
         end
         project.task :build => task
       end

data/lib/ivy4r.rb

@@ -36,7 +36,7 @@ is
 =end
 class Ivy4r
 
-  VERSION = '0.12.1'
+  VERSION = '0.12.2'
   
   # Set the ant home directory to load ant classes from if no custom __antwrap__ is provided
   # and the default provided ant version 1.7.1 should not be used.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ivy4r
 version: !ruby/object:Gem::Version 
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors: 
   - Klaas Reineke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +02:00
+date: 2010-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency