You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by bo...@apache.org on 2010/11/23 00:28:24 UTC
svn commit: r1037939 - in /buildr/trunk: CHANGELOG buildr.gemspec
lib/buildr/java/bdd.rb spec/core/application_spec.rb
Author: boisvert
Date: Mon Nov 22 23:28:24 2010
New Revision: 1037939
URL: http://svn.apache.org/viewvc?rev=1037939&view=rev
Log:
Merge 67aa27510f6d2e242f3a0f80d0a070a4a4bfe187 (but keep using rspec ~> 2.1.0)
Use rspec ~> 1.3.1 and JtestR 0.6
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/buildr.gemspec
buildr/trunk/lib/buildr/java/bdd.rb
buildr/trunk/spec/core/application_spec.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1037939&r1=1037938&r2=1037939&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Mon Nov 22 23:28:24 2010
@@ -20,6 +20,8 @@
1.4.4 (2010-11-16)
* Change: BUILDR-549 Upgrade to RJB 1.3.3 to address "Cannot create JVM" issue with Java Update 3
on Mac OS X. Win32 platform upgraded to RJB 1.3.2.
+* Change: RSpec gem dependency ~> 1.3.1
+* Change: Upgrade to JtestR 0.6
1.4.3 (2010-10-15)
* Added: BUILDR-514 New 'run' local task. http://buildr.apache.org/more_stuff.html#run
Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1037939&r1=1037938&r2=1037939&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Mon Nov 22 23:28:24 2010
@@ -62,7 +62,7 @@ for those one-off tasks, with a language
spec.add_dependency 'rjb', '1.3.3' if spec.platform.to_s == 'ruby'
spec.add_dependency 'rjb', '1.3.2' if spec.platform.to_s == 'x86-mswin32'
spec.add_dependency 'atoulme-Antwrap', '0.7.1'
- spec.add_dependency 'rspec', '= 2.1.0'
+ spec.add_dependency 'rspec', '~> 2.1.0'
spec.add_dependency 'xml-simple', '1.0.12'
spec.add_dependency 'minitar', '0.5.3'
spec.add_dependency 'jruby-openssl', '>= 0.7' if spec.platform.to_s == 'java'
Modified: buildr/trunk/lib/buildr/java/bdd.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/bdd.rb?rev=1037939&r1=1037938&r2=1037939&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/bdd.rb (original)
+++ buildr/trunk/lib/buildr/java/bdd.rb Mon Nov 22 23:28:24 2010
@@ -243,7 +243,7 @@ module Buildr
def runner_config
runner = super
- runner.gems.update 'rspec' => '=2.1.0'
+ runner.gems.update 'rspec' => '~> 2.1.0'
runner.requires.unshift 'rspec'
runner
end
Modified: buildr/trunk/spec/core/application_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/application_spec.rb?rev=1037939&r1=1037938&r2=1037939&view=diff
==============================================================================
--- buildr/trunk/spec/core/application_spec.rb (original)
+++ buildr/trunk/spec/core/application_spec.rb Mon Nov 22 23:28:24 2010
@@ -133,7 +133,7 @@ describe Buildr::Application do
write 'build.yaml', <<-YAML
gems:
- rake
- - rspec >= 1.2
+ - rspec ~> 1.3.1
YAML
Buildr.application.load_gems
end