Author: assaf
Date: Thu Jun 5 14:31:06 2008
New Revision: 663747
URL: http://svn.apache.org/viewvc?rev=663747&view=rev
Log:
Merge branch '1.3.1.1'
Conflicts:
CHANGELOG
buildr.gemspec
Changed: Upgraded to Rubyforge 1.0.0.
Modified:
incubator/buildr/trunk/CHANGELOG
incubator/buildr/trunk/buildr.gemspec
incubator/buildr/trunk/lib/buildr.rb
incubator/buildr/trunk/rakelib/rubyforge.rake
Modified: incubator/buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=663747&r1=663746&r2=663747&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Thu Jun 5 14:31:06 2008
@@ -1,9 +1,13 @@
1.3.2 (Pending)
+* Changed: Upgraded to Rubyforge 1.0.0.
* Fixed: BUILDR-77: Layout feature not working.
* Fixed: BUILDR-76: Added more specs and fixes to compile task.
* Fixed: BUILDR-80: Fix reference to Util#timestamp method on nailgun addon.
* Fixed: BUILDR-79: Remove :source option for Scala compiler
+1.3.1.1 (2008-06-04)
+* Fixed: BUILDR-78 Broken dependency on Rubyforge Gem.
+
1.3.1 (2008-05-19)
* Added: Downloading files from SFTP server, uploading to HTTP.
* Added: jibx_bind method to use JiBX for Java<=>XML binding (by David
Modified: incubator/buildr/trunk/buildr.gemspec
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/buildr.gemspec?rev=663747&r1=663746&r2=663747&view=diff
==============================================================================
--- incubator/buildr/trunk/buildr.gemspec (original)
+++ incubator/buildr/trunk/buildr.gemspec Thu Jun 5 14:31:06 2008
@@ -16,7 +16,7 @@
Gem::Specification.new do |spec|
spec.name = 'buildr'
- spec.version = '1.3.1'
+ spec.version = '1.3.2'
spec.author = 'Apache Buildr'
spec.email = "[EMAIL PROTECTED]"
spec.homepage = "http://incubator.apache.org/#{spec.name}/";
@@ -42,9 +42,10 @@
spec.add_dependency 'net-sftp', '2.0.0'
spec.add_dependency 'rubyzip', '0.9.1'
spec.add_dependency 'highline', '1.4.0'
+ spec.add_dependency 'rubyforge', '1.0.0'
+ spec.add_dependency 'hoe', '1.5.3'
spec.add_dependency 'Antwrap', '0.7.0'
spec.add_dependency 'rspec', '1.1.4'
spec.add_dependency 'xml-simple', '1.0.11'
spec.add_dependency 'archive-tar-minitar', '0.5.2'
- spec.add_dependency 'rubyforge', '1.0.0'
end
Modified: incubator/buildr/trunk/lib/buildr.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr.rb?rev=663747&r1=663746&r2=663747&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr.rb (original)
+++ incubator/buildr/trunk/lib/buildr.rb Thu Jun 5 14:31:06 2008
@@ -24,7 +24,7 @@
require 'builder' # A different kind of buildr, one we use to create XML.
module Buildr
- VERSION = '1.3.1'.freeze # unless const_defined?(:VERSION)
+ VERSION = '1.3.2'.freeze # unless const_defined?(:VERSION)
end
require 'buildr/core'
Modified: incubator/buildr/trunk/rakelib/rubyforge.rake
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/rubyforge.rake?rev=663747&r1=663746&r2=663747&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/rubyforge.rake (original)
+++ incubator/buildr/trunk/rakelib/rubyforge.rake Thu Jun 5 14:31:06 2008
@@ -41,6 +41,7 @@
files =
FileList['published/rubyforge/*.{gem,tgz,zip}'].exclude(changes).existing
print "Uploading #{spec.version} to RubyForge ... "
rubyforge = RubyForge.new
+ rubyforge.configure
rubyforge.login
rubyforge.userconfig.merge!('release_changes'=>changes, 'preformatted' =>
true) if changes
rubyforge.add_release spec.rubyforge_project.downcase, spec.name.downcase,
spec.version.to_s, *files
