svn commit: r1043726 - in /ode/branches/ode-1.3.5.x: Rakefile tasks/gpg.rake

[va...@apache.org]

Author: vanto
Date: Wed Dec  8 22:13:54 2010
New Revision: 1043726

URL: http://svn.apache.org/viewvc?rev=1043726&view=rev
Log:
gpg signing improved.

Modified:
    ode/branches/ode-1.3.5.x/Rakefile
    ode/branches/ode-1.3.5.x/tasks/gpg.rake

Modified: ode/branches/ode-1.3.5.x/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/ode-1.3.5.x/Rakefile?rev=1043726&r1=1043725&r2=1043726&view=diff
==============================================================================
--- ode/branches/ode-1.3.5.x/Rakefile (original)
+++ ode/branches/ode-1.3.5.x/Rakefile Wed Dec  8 22:13:54 2010
@@ -34,7 +34,7 @@ require File.join(File.dirname(__FILE__)
 require File.join(File.dirname(__FILE__), 'dependencies.rb')
 
 # Keep this structure to allow the build system to update version numbers.
-VERSION_NUMBER = "1.3.5rc1"
+VERSION_NUMBER = "1.3.5-SNAPSHOT"
 
 # Apache Nexus Repositories
 if VERSION_NUMBER =~ /SNAPSHOT/
@@ -536,7 +536,8 @@ define "ode" do
   package_with_javadoc unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
 
   # sign artifacts
-  projects.each { |pr| pr.packages.each { |pkg| GPG.sign_and_upload(pkg) } }
+  GPG.sign_before_upload(self)
+
 end
 
 define "apache-ode" do
@@ -626,8 +627,6 @@ define "apache-ode" do
   package(:zip, :id=>"#{id}-docs").include(doc.from(project("ode").projects).
     using(:javadoc, :windowtitle=>"Apache ODE #{project.version}").target, :as=>"#{id}-docs-#{version}") unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
     
-  # sign disto packages
-  projects.each { |pr| pr.packages.each { |pkg| GPG.sign_and_upload(pkg) } }
-  # sign source and javadoc artifacts
-  packages.each { |pkg| GPG.sign_and_upload(pkg) }
+  # sign packages
+  GPG.sign_before_upload(self)
 end

Modified: ode/branches/ode-1.3.5.x/tasks/gpg.rake
URL: http://svn.apache.org/viewvc/ode/branches/ode-1.3.5.x/tasks/gpg.rake?rev=1043726&r1=1043725&r2=1043726&view=diff
==============================================================================
--- ode/branches/ode-1.3.5.x/tasks/gpg.rake (original)
+++ ode/branches/ode-1.3.5.x/tasks/gpg.rake Wed Dec  8 22:13:54 2010
@@ -38,4 +38,13 @@ module GPG
     artifact.from sign_task(pkg)
     task(:upload).enhance [artifact.upload_task]
   end
+
+  def sign_before_upload(root)
+    root.enhance do 
+      [root, root.projects].flatten.each { |prj|
+        prj.packages.each { |pkg| sign_and_upload(pkg); puts pkg }
+        prj.packages.map {|pkg| pkg.pom }.uniq.each { |pom| sign_and_upload(pom) }
+      }
+    end
+  end
 end