buildr 1.4.17-java → 1.4.18-java

data/rakelib/release.rake

@@ -47,24 +47,6 @@ task 'release' => %w{setup-local-site-svn} do
     puts "[X] Uploaded new site to #{spec.name}.apache.org"
   end.call
 
-  # Upload binary and source packages to RubyForge.
-  lambda do
-    # update rubyforge projects, processors, etc. in local config
-    sh 'rubyforge', 'config'
-    files = FileList["_release/#{spec.version}/dist/*.{gem,tgz,zip}"]
-    puts "Uploading #{spec.version} to RubyForge ... "
-    rubyforge = RubyForge.new.configure
-    rubyforge.login
-    rubyforge.userconfig.merge!('release_changes'=>"_release/#{spec.version}/CHANGES",  'preformatted' => true)
-    rubyforge.add_release spec.rubyforge_project.downcase, spec.name.downcase, spec.version.to_s, *files
-
-    puts "Posting news to RubyForge ... "
-    changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]
-    rubyforge.post_news spec.rubyforge_project.downcase, "Buildr #{spec.version} released",
-      "#{spec.description}\n\nNew in Buildr #{spec.version}:\n#{changes.gsub(/^/, '  ')}\n"
-    puts "[X] Uploaded gems and source files to #{spec.name}.rubyforge.org"
-  end.call
-
   # Push gems to Rubyforge.org
   lambda do
     files = FileList["_release/#{spec.version}/dist/*.{gem}"]
@@ -86,7 +68,7 @@ task 'release' => %w{setup-local-site-svn} do
   lambda do
     version = `git describe --tags --always`.strip
     unless version == spec.version
-      sh 'git', 'tag', '-m', "'Release #{spec.version}'", spec.version do |ok, res|
+      sh 'git', 'tag', '-m', "'Release #{spec.version}'", spec.version.to_s do |ok, res|
         if ok
           puts "[X] Tagged this release as #{spec.version} ... "
         else

data/rakelib/stage.rake

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'rubyforge'
 require 'digest/md5'
 require 'digest/sha1'
 
@@ -77,6 +76,7 @@ task 'prepare' do |task, args|
   end.call
 
   task('license').invoke
+  task('addon_extensions:check').invoke
 
   # Need Prince to generate PDF
   lambda do
@@ -85,14 +85,6 @@ task 'prepare' do |task, args|
     puts '[X] We have prince available'
   end.call
 
-  # Need RubyForge to upload new release files.
-  lambda do
-    puts "[!] Make sure you have admin privileges to make a release on RubyForge"
-    rubyforge = RubyForge.new.configure
-    rubyforge.login
-    rubyforge.scrape_project(spec.name)
-  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'
 end

data/spec/addon/custom_pom_spec.rb

@@ -13,6 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+# The testing framework does not support loading and then unloading of addons
+# thus we can not test this addon until we figure out a mechanism of supporting
+# unloading addon as the test progresses
+if false
 
 require File.expand_path('../spec_helpers', File.dirname(__FILE__))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'xpath_matchers'))
@@ -147,3 +151,5 @@ describe Buildr::CustomPom do
     end
   end
 end
+
+end

data/spec/packaging/artifact_spec.rb

@@ -248,7 +248,7 @@ describe Repositories, 'remote' do
   it 'should lookup in array order' do
     repositories.remote = [ 'http://buildr.apache.org/repository/noexist', 'http://example.org' ]
     order = ['com', 'org']
-    URI.should_receive(:download).any_number_of_times do |uri, target, options|
+    URI.stub(:download) do |uri, target, options|
       order.shift if order.first && uri.to_s[order.first]
       fail URI::NotFoundError unless order.empty?
       write target
@@ -1023,7 +1023,7 @@ describe Rake::Task, ' artifacts:sources' do
 
   it 'should download sources for all specified artifacts' do
     artifact 'group:id:jar:1.0'
-    URI.should_receive(:download).any_number_of_times.and_return { |uri, target| write target }
+    URI.stub(:download).and_return { |uri, target| write target }
     lambda { task('artifacts:sources').invoke }.should change { File.exist?('home/.m2/repository/group/id/1.0/id-1.0-sources.jar') }.to(true)
   end
 
@@ -1037,7 +1037,7 @@ describe Rake::Task, ' artifacts:sources' do
 
     before do
       artifact 'group:id:jar:1.0'
-      URI.should_receive(:download).any_number_of_times.and_raise(URI::NotFoundError)
+      URI.should_receive(:download).and_raise(URI::NotFoundError)
     end
 
     it 'should not fail' do
@@ -1062,7 +1062,7 @@ describe Rake::Task, ' artifacts:javadoc' do
 
   it 'should download javadoc for all specified artifacts' do
     artifact 'group:id:jar:1.0'
-    URI.should_receive(:download).any_number_of_times.and_return { |uri, target| write target }
+    URI.should_receive(:download).and_return { |uri, target| write target }
     lambda { task('artifacts:javadoc').invoke }.should change { File.exist?('home/.m2/repository/group/id/1.0/id-1.0-javadoc.jar') }.to(true)
   end
 
@@ -1076,7 +1076,7 @@ describe Rake::Task, ' artifacts:javadoc' do
 
     before do
       artifact 'group:id:jar:1.0'
-      URI.should_receive(:download).any_number_of_times.and_raise(URI::NotFoundError)
+      URI.should_receive(:download).and_raise(URI::NotFoundError)
     end
 
     it 'should not fail' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.4.17
+  version: 1.4.18
 platform: java
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,20 +108,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: rubyforge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -388,7 +374,7 @@ files:
 - addon/buildr/checkstyle.rb
 - addon/buildr/cobertura.rb
 - addon/buildr/css_lint-report.xsl
-- addon/buildr/css_lint.rake
+- addon/buildr/css_lint.rb
 - addon/buildr/custom_pom.rb
 - addon/buildr/drb.rb
 - addon/buildr/emma.rb
@@ -401,6 +387,7 @@ files:
 - addon/buildr/javacc.rb
 - addon/buildr/javancss.rb
 - addon/buildr/jaxb_xjc.rb
+- addon/buildr/jdepend-report.xsl
 - addon/buildr/jdepend.rb
 - addon/buildr/jetty.rb
 - addon/buildr/jibx.rb