buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject git commit: Fix bug introduced in 1.4.18 version of custom_pom addon where poms are created for artifacts that have a classifier.
Date Thu, 03 Jul 2014 09:55:23 GMT
Repository: buildr
Updated Branches:
  refs/heads/master 6c7a0437f -> 983824724


Fix bug introduced in 1.4.18 version of custom_pom addon where poms are created for artifacts
that have a classifier.


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/98382472
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/98382472
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/98382472

Branch: refs/heads/master
Commit: 983824724980b489e99e8478d7d6061c87e98faf
Parents: 6c7a043
Author: Peter Donald <peter@realityforge.org>
Authored: Thu Jul 3 19:55:15 2014 +1000
Committer: Peter Donald <peter@realityforge.org>
Committed: Thu Jul 3 19:55:15 2014 +1000

----------------------------------------------------------------------
 CHANGELOG                  | 2 ++
 addon/buildr/custom_pom.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/98382472/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index dc26fdc..85a8a2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 1.4.19 (Pending)
+* Fixed:  Fix bug introduced in 1.4.18 version of custom_pom addon where
+          poms are created for artifacts that have a classifier.
 
 1.4.18 (2014-06-24)
 * Fixed:  BUILDR-699 - Update the custom_pom addon to avoid failure when

http://git-wip-us.apache.org/repos/asf/buildr/blob/98382472/addon/buildr/custom_pom.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/custom_pom.rb b/addon/buildr/custom_pom.rb
index 3f69045..42e4e0b 100644
--- a/addon/buildr/custom_pom.rb
+++ b/addon/buildr/custom_pom.rb
@@ -250,7 +250,7 @@ module Buildr
 
       after_define do |project|
         project.packages.each do |pkg|
-          if pkg.type.to_s == 'jar' && !pkg.classifier
+          if pkg.type.to_s == 'jar' && pkg.classifier.nil?
             class << pkg
               def pom_xml
                 self.pom.content


Mime
View raw message