buildr 1.4.23-java → 1.4.24-java

data/addon/buildr/wsgen.rb

@@ -43,7 +43,7 @@ module Buildr
         project.task("java2wsdl").enhance([project.compile.target])
 
         base_wsdl_dir = File.expand_path(options[:output_dir] || project._(:target, :generated, :wsgen, :main, :wsdl))
-        project.iml.main_source_directories << base_wsdl_dir if project.iml?
+        project.iml.main_generated_source_directories << base_wsdl_dir if project.iml?
         project.file(base_wsdl_dir)
         project.task("java2wsdl").enhance([base_wsdl_dir])
 
@@ -182,7 +182,7 @@ module Buildr
         end
 
         project.compile.from ws_dir
-        project.iml.main_source_directories << ws_dir if project.iml?
+        project.iml.main_generated_source_directories << ws_dir if project.iml?
         project.compile.enhance(['wsdl2java'])
 
         ws_dir

data/doc/download.textile

@@ -18,16 +18,28 @@ The source code is included in both source and binary distribution, the Gem dist
 
 h2(#dist).  Binaries and Source Code
 
+h3. buildr 1.4.23 (2015-06-12)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.4.23-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23-java.gem | "e2e437989933c8602ba0b41b9bcc4988":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-java.gem.asc |
+| "buildr-1.4.23-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem | "0977069ebdf6b902b86f9c0a757d70c9":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem.asc |
+| "buildr-1.4.23.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23.gem | "012cc3319768f8fa37f5743284d5ad31":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.gem.asc |
+| "buildr-1.4.23.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23.tgz | "40acd29febb55bec063ec8a77bf40fc1":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.tgz.asc |
+| "buildr-1.4.23.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23.zip | "f3ad77a50e4c8c88b91994ff6b703bcd":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.23/KEYS)
+
+
 h3. buildr 1.4.22 (2015-02-28)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.4.22-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.22/buildr-1.4.22-java.gem | "f439a733481169889ad8f240c067b363":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22-java.gem.asc |
-| "buildr-1.4.22-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem | "511966d49f3933f40f195eb03e158c7b":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem.asc |
-| "buildr-1.4.22.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.22/buildr-1.4.22.gem | "678061023447005438cd2e8c9d50be3b":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.gem.asc |
-| "buildr-1.4.22.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.22/buildr-1.4.22.tgz | "c4b2eb1aa508a039da0f1679d7dc78d9":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.tgz.asc |
-| "buildr-1.4.22.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.22/buildr-1.4.22.zip | "2b2aca5092cccd916f6504745ec3ff4d":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.zip.asc |
+| "buildr-1.4.22-java.gem":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-java.gem | "f439a733481169889ad8f240c067b363":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-java.gem.asc |
+| "buildr-1.4.22-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem | "511966d49f3933f40f195eb03e158c7b":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem.asc |
+| "buildr-1.4.22.gem":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.gem | "678061023447005438cd2e8c9d50be3b":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.gem.asc |
+| "buildr-1.4.22.tgz":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.tgz | "c4b2eb1aa508a039da0f1679d7dc78d9":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.tgz.asc |
+| "buildr-1.4.22.zip":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.zip | "2b2aca5092cccd916f6504745ec3ff4d":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.22/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.22/KEYS)
 
 
 h3. buildr 1.4.21 (2014-11-28)

data/doc/index.textile

@@ -46,30 +46,22 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
-Highlights from Buildr 1.4.23 (2015-06-12)
-* Change: BUILDR-706 - Update the checkstyle addon use checkstyle 6.6. Submitted
-          by Dieter Vrancken.
-* Fixed:  Fix Buildr.rspec_present? so that it works under jruby 1.6.7.2
-* Change: BUILDR-705 - Avoid attempting to load rspec classes unless Buildr.rspec_present?
-          returns true. Reported By rbpandey.
-
-Highlights from Buildr 1.4.22 (2015-02-28)
-* Change: BUILDR-704 - Updated the Sonar addon to support the latest version of SonarQube
-          Runner. Submitted by Ross Mahony.
-* Change: Update the buildr gemspec so that rspec is no longer a required dependency.
-          This enables end-users to use a different version of rspec and buildr in
-          the same project. The rspec version MUST be be compatible with the version
-          used by Buildr if rspec features are used from within Buildr. Buildr also
-          issues a warning if the `check` method is called and rspec has not been loaded.
-          The warning includes directions on how to resolve the issue. Submitted by r6p.
-* Fixed:  A long standing bug existed such that if tests failed to compile, and the
-          option Buildr.options.test is set to :all then the compilation error would
-          not result in a failed build. As many people set the Buildr.options.test to
-          :all in their continuous delivery/integration tools, this has caused some
-          problems. This has been fixed by ensuring all the problems associated with
-          the resolving the prerequisites are not caught when Buildr.options.test is
-          set to :all.
-* Change: Update checkstyle to 6.1.1. Submitted by neher.
+Highlights from Buildr 1.4.24 (2016-03-19)
+* Added:  Support the :no_invoke parameter being passed to Buildr.project() and
+          Buildr.projects() to avoid attempting to call invoke when retrieving the projects.
+* Added:  Add `exclude_paths` setting to pmd addon to allow paths to be explicitly excluded.
+* Fixed:  Update jDepend addon to ensure target directories are invoked prior to attempting
+          to analyze directories.
+* Added:  Add jdepend.additional_project_names configuration to jDepend addon to
+          ease merging in the source paths from multiple projects into one jDepend task.
+* Added:  Add findbugs.additional_project_names configuration to Findbugs addon to
+          ease merging in the source paths from multiple projects into one Findbugs task.
+* Added:  Add checkstyle.additional_project_names configuration to Checkstyle addon to
+          ease merging in the source paths from multiple projects into one Checkstyle task.
+* Added:  Add pmd.additional_project_names configuration to PMD addon to ease merging in
+          the source paths from multiple projects into one PMD task.
+* Change: Update the default GWT version used in the GWT addon to the latest release 2.7.0.
+* Change: Update the checkstyle addon to use checkstyle 6.12.1.
 
 This is a partial list -- see the "CHANGELOG":CHANGELOG for full details.
 

data/etc/KEYS

@@ -318,3 +318,39 @@ AbKC6d82L04esDIV38wV9HjEH2n3gIqbMLlS19GXtMHodV/vnrX3qP2u4VobApsA
 vNcZccHdEbAhg06FGA6u16Jc
 =Kl2l
 -----END PGP PUBLIC KEY BLOCK-----
+pub   2048R/5E469BCB 2016-03-10
+uid       [ultimate] Antoine Toulme <toulmean@apache.org>
+sig 3        5E469BCB 2016-03-10  Antoine Toulme <toulmean@apache.org>
+sub   2048R/C380C925 2016-03-10
+sig          5E469BCB 2016-03-10  Antoine Toulme <toulmean@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: GPGTools - https://gpgtools.org
+
+mQENBFbhCrABCADBZJYY7g949txfE5JLHdp7AUE6Dd0g2pnYUjUHwjhW/oswym4U
+AA9QIWORZcJx9C3DnilUwVtJS5TGc/RrB7P0EDQ499kKP5gdd+aFNiiVta+CXT0u
+ic7KKYDnIlWWB/cxZCHdeGoLsd3tzY1D+Zt+asUP1Vaf8zUP1DGERJdBZFEs8Lpq
+5A9rD2KInc3XYnEebJa3zcxNTN1EqHHnGAIf1oOZKeWvBQVeYUw9JyA1qvNBrbXW
+uLjj4I3EJUzJ4BYjqbxDQmKlPVyxdaUfeuBAwZm6k9xrYRZLQkMNT2TfR4uWeVHY
+VwKMZKkJs4ZLtb32K3SzR3zUN1dkwHcsSFkFABEBAAG0JEFudG9pbmUgVG91bG1l
+IDx0b3VsbWVhbkBhcGFjaGUub3JnPokBNwQTAQoAIQUCVuEKsAIbAwULCQgHAwUV
+CgkICwUWAgMBAAIeAQIXgAAKCRABO3qJXkaby1frB/97UCrhW1+t+pPQ4ZeAzsLO
+DdFxEHUBKsh/08K7gXqGt+C8sMWUL84yzrXJYMT4U3AI+JndSruxuFKa/k3xTp03
+UkWWu7wG1OBp5LX2GXOZrtcIqYSRj0OIoiMxQalW83ThCK1bXEhNYM8AWvIhYmE+
+C07Aev40zg1QZoKzqzxYFNdt6eerjVU+DUz5JQY/h51bsDF3hGhr1ZTSImy2whgG
+fD6V0sm8OeVlqkr2JLMpzK07w71HD4x/OxConRZO6HJiQH96JJvrJb7sgnEH+yTq
+rxLUviNr17NI7Cz4yQ0UM2RQlOWRwNaiS2yyqEFldfSZL6iXHvWsLzsCTD4VPdZt
+uQENBFbhCrABCADHlgW/e2Y+EkHrM4/HSr0gi9UZdnmhCrtk6hEDdU13BLAqoSpR
+YhUEa24m9r3BA6KpiIUVe3SJqKOdKYMGsUi9nUX+x6I8qGCxy+9YaTxiJxEZq41r
+go9z8meNJRfzPKOmCvN8htXIXMNsfk41j6FuHpAkVixjPquGWhbgGatjXcsejJKJ
++sYKmeVmOcW+OZ6dm+HKJAa63M5OAheJRn/MzvFHmlLU7GUT63nLJ3BypETT6s6G
+kD7sB0hfuiP9rX3z0jYpoKCZ6NLe0kCUknIG/eGvKTAliQnTFGvgU8hXWyJtCCq0
+2TdX1pTY5RbfDjiR7uUwbsI+LHyALj+wqI69ABEBAAGJAR8EGAEKAAkFAlbhCrAC
+GwwACgkQATt6iV5Gm8s0ZwgAiuBAkjWKlg5WXFc1NlVn4lS7+IjJRL0qOwgHVaFS
+BF28XPN4NTC2yxDLWYi5A83/2lXeKpoS+mzyH2adWHf167w0jVul0Qy/SxS6YyEk
+NIUCirFjt/TQujlB47/a3UxUe0txxYj3e4FADe0gs1XEbpKzv2mKJgNK/GyM1+GA
+I7UuE4Y9W1PONDTweeUC9dYfVTQepmvatYsljmE5aAp7bCwdqp3tYYCgmHEQL5GM
+HSqfJZu8rAo7mHRsd56Q3RQSXft6gWlclf2Fd4BX3lFVwJPQLJ2J+FoUWUN3Kvri
+SytM5SUx7NT8IMCYqRKwKc3tNhYstquDgTe2VOgkhuxUAg==
+=fVHy
+-----END PGP PUBLIC KEY BLOCK-----

data/lib/buildr/core/project.rb

@@ -234,7 +234,9 @@ module Buildr #:nodoc:
       def project(*args, &block) #:nodoc:
         options = args.pop if Hash === args.last
         return define(args.first, options, &block) if block
-        rake_check_options options, :scope if options
+        rake_check_options options, :scope, :no_invoke if options
+        no_invoke = options && options[:no_invoke]
+
         raise ArgumentError, 'Only one project name at a time' unless args.size == 1
         @projects ||= {}
         name = args.first.to_s
@@ -251,7 +253,7 @@ module Buildr #:nodoc:
         end
         project ||= @projects[name] # Not found in scope.
         raise "No such project #{name}" unless project
-        project.invoke unless Buildr.application.current_scope.join(":").to_s == project.name.to_s
+        project.invoke unless no_invoke || Buildr.application.current_scope.join(":").to_s == project.name.to_s
         project
       end
 
@@ -261,26 +263,29 @@ module Buildr #:nodoc:
       # See Buildr#projects.
       def projects(*names) #:nodoc:
         options = names.pop if Hash === names.last
-        rake_check_options options, :scope if options
+        rake_check_options options, :scope, :no_invoke if options
+
+        no_invoke = options && options[:no_invoke]
+
         @projects ||= {}
         names = names.flatten
         if options && options[:scope]
           # We assume parent project is evaluated.
           if names.empty?
             parent = @projects[options[:scope].to_s] or raise "No such project #{options[:scope]}"
-            @projects.values.select { |project| project.parent == parent }.each { |project| project.invoke }.
-              map { |project| [project] + projects(:scope=>project) }.flatten.sort_by(&:name)
+            @projects.values.select { |project| project.parent == parent }.each { |project| project.invoke unless no_invoke }.
+              map { |project| [project] + projects(:scope => project, :no_invoke => no_invoke) }.flatten.sort_by(&:name)
           else
-            names.uniq.map { |name| project(name, :scope=>options[:scope]) }
+            names.uniq.map { |name| project(name, :scope => options[:scope], :no_invoke => no_invoke) }
           end
         elsif names.empty?
           # Parent project(s) not evaluated so we don't know all the projects yet.
-          @projects.values.each(&:invoke)
-          @projects.keys.map { |name| project(name) or raise "No such project #{name}" }.sort_by(&:name)
+          @projects.values.each { |project| project.invoke unless no_invoke }
+          @projects.keys.map { |name| project(name, :no_invoke => no_invoke) or raise "No such project #{name}" }.sort_by(&:name)
         else
           # Parent project(s) not evaluated, for the sub-projects we may need to find.
-          names.map { |name| name.split(':') }.select { |name| name.size > 1 }.map(&:first).uniq.each { |name| project(name) }
-          names.uniq.map { |name| project(name) or raise "No such project #{name}" }.sort_by(&:name)
+          names.map { |name| name.split(':') }.select { |name| name.size > 1 }.map(&:first).uniq.each { |name| project(name, :no_invoke => no_invoke) }
+          names.uniq.map { |name| project(name, :no_invoke => no_invoke) or raise "No such project #{name}" }.sort_by(&:name)
         end
       end
 

data/lib/buildr/ide/idea.rb

@@ -213,17 +213,35 @@ module Buildr #:nodoc:
       end
 
       def main_source_directories
-        @main_source_directories ||= [
-          buildr_project.compile.sources,
-          buildr_project.resources.sources
-        ].flatten.compact
+        @main_source_directories ||= [buildr_project.compile.sources].flatten.compact
+      end
+
+      def main_resource_directories
+        @main_resource_directories ||= [buildr_project.resources.sources].flatten.compact
+      end
+
+      def main_generated_source_directories
+        @main_generated_source_directories ||= []
+      end
+
+      def main_generated_resource_directories
+        @main_generated_resource_directories ||= []
       end
 
       def test_source_directories
-        @test_source_directories ||= [
-          buildr_project.test.compile.sources,
-          buildr_project.test.resources.sources
-        ].flatten.compact
+        @test_source_directories ||= [buildr_project.test.compile.sources].flatten.compact
+      end
+
+      def test_resource_directories
+        @test_resource_directories ||= [buildr_project.test.resources.sources].flatten.compact
+      end
+
+      def test_generated_source_directories
+        @test_generated_source_directories ||= []
+      end
+
+      def test_generated_resource_directories
+        @test_generated_resource_directories ||= []
       end
 
       def excluded_directories
@@ -249,11 +267,11 @@ module Buildr #:nodoc:
       end
 
       def main_dependencies
-        @main_dependencies ||=  buildr_project.compile.dependencies
+        @main_dependencies ||= buildr_project.compile.dependencies.dup
       end
 
       def test_dependencies
-        @test_dependencies ||=  buildr_project.test.compile.dependencies
+        @test_dependencies ||= buildr_project.test.compile.dependencies.dup
       end
 
       def add_facet(name, type)
@@ -467,6 +485,21 @@ module Buildr #:nodoc:
         p
       end
 
+      def main_dependency_details
+        target_dir = buildr_project.compile.target.to_s
+        main_dependencies.select { |d| d.to_s != target_dir }.collect do |d|
+          dependency_path = d.to_s
+          export = true
+          source_path = nil
+          if d.respond_to?(:to_spec_hash)
+            source_spec = d.to_spec_hash.merge(:classifier => 'sources')
+            source_path = Buildr.artifact(source_spec).to_s
+            source_path = nil unless File.exist?(source_path)
+          end
+          [dependency_path, export, source_path]
+        end
+      end
+
       def test_dependency_details
         main_dependencies_paths = main_dependencies.map(&:to_s)
         target_dir = buildr_project.compile.target.to_s
@@ -512,7 +545,7 @@ module Buildr #:nodoc:
           project_dependencies = []
 
 
-          self.test_dependency_details.each do |dependency_path, export, source_path|
+          self.main_dependency_details.each do |dependency_path, export, source_path|
             next unless export
             generate_lib(xml, dependency_path, export, source_path, project_dependencies)
           end
@@ -568,12 +601,24 @@ module Buildr #:nodoc:
       def generate_content(xml)
         xml.content(:url => 'file://$MODULE_DIR$') do
           # Source folders
-          {
-            :main => self.main_source_directories,
-            :test => self.test_source_directories
-          }.each do |kind, directories|
-            directories.map { |dir| dir.to_s }.compact.sort.uniq.each do |dir|
-              xml.sourceFolder :url => file_path(dir), :isTestSource => (kind == :test ? 'true' : 'false')
+          [
+            {:dirs => (self.main_source_directories.dup - self.main_generated_source_directories)},
+            {:dirs => self.main_generated_source_directories, :generated => true},
+            {:type => 'resource', :dirs => (self.main_resource_directories.dup - self.main_generated_resource_directories)},
+            {:type => 'resource', :dirs => self.main_generated_resource_directories, :generated => true},
+            {:test => true, :dirs => (self.test_source_directories - self.test_generated_source_directories)},
+            {:test => true, :dirs => self.test_generated_source_directories, :generated => true},
+            {:test => true, :type => 'resource', :dirs => (self.test_resource_directories - self.test_generated_resource_directories)},
+            {:test => true, :type => 'resource', :dirs => self.test_generated_resource_directories, :generated => true},
+          ].each do |content|
+            content[:dirs].map { |dir| dir.to_s }.compact.sort.uniq.each do |dir|
+              options = {}
+              options[:url] = file_path(dir)
+              options[:isTestSource] = (content[:test] ? 'true' : 'false') if content[:type] != 'resource'
+              options[:type] = 'java-resource' if content[:type] == 'resource' && !content[:test]
+              options[:type] = 'java-test-resource' if content[:type] == 'resource' && content[:test]
+              options[:generated] = 'true' if content[:generated]
+              xml.sourceFolder options
             end
           end
 

data/lib/buildr/java/tests.rb

@@ -96,9 +96,9 @@ module Buildr #:nodoc:
         Buildr.settings.build['jmock'] || VERSION
       end
 
-      def dependencies(versions = {:hamcrest => "1.1"})
+      def dependencies(versions = {:hamcrest => '1.1'})
         two_or_later = version[0,1].to_i >= 2
-        group = two_or_later ? "org.jmock" : "jmock"
+        group = two_or_later ? 'org.jmock' : 'jmock'
 
         @dependencies ||= ["#{group}:jmock:jar:#{version}"]
         if two_or_later
@@ -112,7 +112,7 @@ module Buildr #:nodoc:
     private
       def const_missing(const)
         return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated "Please use JMock.dependencies/.version instead of JMock::REQUIRES/VERSION"
+        Buildr.application.deprecated 'Please use JMock.dependencies/.version instead of JMock::REQUIRES/VERSION'
         dependencies
       end
     end
@@ -198,7 +198,7 @@ module Buildr #:nodoc:
       end
 
       def dependencies
-        four11_or_newer = version >= "4.11"
+        four11_or_newer = version >= '4.11'
         @dependencies ||= ["junit:junit:jar:#{version}"]+ (four11_or_newer ? JMock.dependencies({:hamcrest => '1.3'}) : JMock.dependencies)
       end
 
@@ -209,7 +209,7 @@ module Buildr #:nodoc:
     private
       def const_missing(const)
         return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated "Please use JUnit.dependencies/.version instead of JUnit::REQUIRES/VERSION"
+        Buildr.application.deprecated 'Please use JUnit.dependencies/.version instead of JUnit::REQUIRES/VERSION'
         dependencies
       end
     end
@@ -312,7 +312,7 @@ module Buildr #:nodoc:
     private
       def const_missing(const)
         return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated "Please use TestNG.dependencies/.version instead of TestNG::REQUIRES/VERSION"
+        Buildr.application.deprecated 'Please use TestNG.dependencies/.version instead of TestNG::REQUIRES/VERSION'
         dependencies
       end
     end
@@ -326,19 +326,19 @@ module Buildr #:nodoc:
     def run(tests, dependencies) #:nodoc:
       cmd_args = []
       cmd_args << '-suitename' << task.project.id
-      cmd_args << '-sourcedir' << task.compile.sources.join(';') if TestNG.version < "6.0"
+      cmd_args << '-sourcedir' << task.compile.sources.join(';') if TestNG.version < '6.0'
       cmd_args << '-log' << '2'
       cmd_args << '-d' << task.report_to.to_s
       exclude_args = options[:excludegroups] || []
       if !exclude_args.empty?
-        cmd_args << '-excludegroups' << exclude_args.join(",")
+        cmd_args << '-excludegroups' << exclude_args.join(',')
       end
       groups_args = options[:groups] || []
       if !groups_args.empty?
-        cmd_args << '-groups' << groups_args.join(",")
+        cmd_args << '-groups' << groups_args.join(',')
       end
       # run all tests in the same suite
-      cmd_args << '-testclass' << (TestNG.version < "6.0" ? test : tests.join(','))
+      cmd_args << '-testclass' << (TestNG.version < '6.0' ? test : tests.join(','))
 
       cmd_args += options[:args] if options[:args]
 
@@ -347,7 +347,7 @@ module Buildr #:nodoc:
 
       tmp = nil
       begin
-        tmp = Tempfile.open("testNG")
+        tmp = Tempfile.open('testNG')
         tmp.write cmd_args.join("\n")
         tmp.close
         Java::Commands.java ['org.testng.TestNG', "@#{tmp.path}"], cmd_options
@@ -387,7 +387,7 @@ module Buildr #:nodoc:
 
     def initialize(task, options) #:nodoc:
       super
-      fail "Missing :frameworks option" unless options[:frameworks]
+      fail 'Missing :frameworks option' unless options[:frameworks]
       @frameworks = options[:frameworks].map do |f|
         framework_options = (options[:options] || {})[f.to_sym] || {}
         f.new(task, framework_options)

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.4.23'.freeze
+  VERSION = '1.4.24'.freeze
 end

data/rakelib/stage.rake

@@ -22,6 +22,7 @@ STAGE_DATE = ENV['STAGE_DATE'] ||  Time.now.strftime('%Y-%m-%d')
 
 task 'prepare' do |task, args|
   gpg_arg = args.gpg || ENV['gpg']
+  user = args.user || ENV['user'] || `whoami`
 
   # Update source files to next release number.
   lambda do
@@ -84,6 +85,13 @@ task 'prepare' do |task, args|
     sh 'prince --version'
     puts '[X] We have prince available'
   end.call
+  
+  # Need lftp to push the stage website to home.apache.org
+  lambda do
+    puts 'Checking that lftp is available...'
+    sh 'lftp --version'
+    puts '[X] We have lftp available'
+  end.call
 
   raise "Can not run stage process under jruby" if RUBY_PLATFORM[/java/]
   raise "Can not run staging process under older rubies" unless RUBY_VERSION >= '1.9'
@@ -91,6 +99,7 @@ end
 
 task 'stage' => %w(clobber prepare) do |task, args|
   gpg_arg = args.gpg || ENV['gpg']
+  user = args.user || ENV['user'] || `whoami`
   mkpath '_staged'
 
   lambda do
@@ -173,12 +182,11 @@ p>. ("Release signing keys":#{official}/KEYS)
   end.call
 
 
-  # Move everything over to people.apache.org so we can vote on it.
+  # Move everything over to home.apache.org so we can vote on it.
   lambda do
-    url = "people.apache.org:~/public_html/#{spec.name}/#{spec.version}"
-    puts "Uploading _staged directory to #{url} ..."
-    sh 'rsync', '--progress', '--recursive', '_staged/', url
-    puts "[X] Uploaded _staged directory to #{url}"
+    puts "Uploading _staged directory ..."
+    sh "lftp -e \"mirror -R _staged public_html/buildr/#{spec.version}; bye\" -u #{user} sftp://home.apache.org" 
+    puts "[X] Uploaded _staged directory"
   end.call
 
 
@@ -186,8 +194,7 @@ p>. ("Release signing keys":#{official}/KEYS)
   # email for you and vote on it.
   lambda do
     # Need to know who you are on Apache, local user may be different (see .ssh/config).
-    whoami = `ssh people.apache.org whoami`.strip
-    base_url = "http://people.apache.org/~#{whoami}/buildr/#{spec.version}"
+    base_url = "http://home.apache.org/~#{user}/buildr/#{spec.version}"
     # Need changes for this release only.
     changelog = File.read('CHANGELOG').scan(/(^(\d+\.\d+(?:\.\d+)?)\s+\(\d{4}-\d{2}-\d{2}\)\s*((:?^[^\n]+\n)*))/)
     changes = changelog[0][2]