Preparing for release shortly

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8321 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

17 files changed, 33 insertions, 48 deletions

diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 220c16ca3b..a50b198c4e 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,4 +1,4 @@
-*2.0.0 [RC2]* (November 28th, 2007)
+*2.0.0* (December 6th, 2007)
 
 * Update ActionMailer so it treats ActionView the same way that ActionController does.  Closes #10244 [rick]
 
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 64db41207f..26911429ed 100755
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -55,7 +55,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 1.99.1' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.0.0' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 32897bc890..c38db57e9a 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -1,8 +1,8 @@
 module ActionMailer
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 99
-    TINY  = 1
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 9d215e9d3d..f1e2aa455a 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,4 +1,4 @@
-*SVN*
+*2.0.0* (December 6th, 2007)
 
 * Fixed send_file/binary_content for testing #8044 [tolsen]
 
@@ -14,9 +14,6 @@
 
 * Fixed that verification violations with no specified action didn't halt the chain (now they do with a 400 Bad Request) [DHH]
 
-
-*2.0.0 [RC2]* (November 28th, 2007)
-
 * Raise UnknownHttpMethod exception for unknown HTTP methods. Closes #10303 [tarmo]
 
 * Update to Prototype -r8232.  [sam]
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 9bd8fbe314..c544d47e34 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -76,7 +76,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 1.99.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.0.0' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 9e62961a80..d63c72f142 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -1,8 +1,8 @@
 module ActionPack #:nodoc:
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 99
-    TINY  = 1
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index c3b5a60a03..698ad6263a 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,4 +1,4 @@
-*SVN*
+*2.0.0* (December 6th, 2007)
 
 * Fixed that the truncation of strings longer than 50 chars should use inspect so newlines etc are escaped #10385 [norbert]
 
@@ -20,9 +20,6 @@
 
 * Fix documentation typo introduced in [8250]. Closes #10339 [Henrik N]
 
-
-*2.0.0 [RC2]* (November 28th, 2007)
-
 * Foxy fixtures: support single-table inheritance.  #10234 [tom]
 
 * Foxy fixtures: allow mixed usage to make migration easier and more attractive.  #10004 [lotswholetime]
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 766cfaa95f..7b51c57240 100755
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -172,7 +172,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
 
-  s.add_dependency('activesupport', '= 1.99.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.0.0' + PKG_BUILD)
 
   s.files.delete "test/fixtures/fixture_database.sqlite"
   s.files.delete "test/fixtures/fixture_database_2.sqlite"
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index c111082ffc..da83c707ce 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -1,8 +1,8 @@
 module ActiveRecord
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 99
-    TINY  = 1
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index a84dfd6ed7..5919931b29 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -1,12 +1,9 @@
-*2.0.0 [RC2]* (November 28th, 2007)
+*2.0.0* (December 6th, 2007)
 
 * Don't cache net/http object so that ActiveResource is more thread-safe.  Closes #10142 [kou]
 
 * Update XML documentation examples to include explicit type attributes. Closes #9754 [hasmanyjosh]
 
-
-*2.0.0 [Preview Release]* (September 29th, 2007)
-
 * Added one-off declarations of mock behavior [DHH]. Example:
 
     Before:
diff --git a/activeresource/Rakefile b/activeresource/Rakefile
index 88669141d8..f643593732 100644
--- a/activeresource/Rakefile
+++ b/activeresource/Rakefile
@@ -62,7 +62,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
   
-  s.add_dependency('activesupport', '= 1.99.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.0.0' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'active_resource'
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index ca8fcdb598..79ea4f2539 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -1,8 +1,8 @@
 module ActiveResource
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 99
-    TINY  = 1
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 89fd5b156a..7c08919755 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,4 +1,4 @@
-*2.0.0 [RC2]* (November 28th, 2007)
+*2.0.0* (December 6th, 2007)
 
 * Added Array#from and Array#to that behaves just from String#from and String#to [DHH]
 
@@ -63,9 +63,6 @@
 
 * Fixed Date#xmlschema for dates outside the range of what can be created with Time #9744 [Geoff Buesing]
 
-
-*2.0.0 [Preview Release]* (September 29th, 2007)
-
 * Fixed that La Paz was included in -25200 and -14400 offsets when it should only be in -14400 #9735 [bermi]
 
 * Fixed JSON encoding to use quoted keys according to the JSON standard #8762 [choonkat/chuyeow]
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index 008b920714..d44e7cfdfa 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -1,8 +1,8 @@
 module ActiveSupport
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 99
-    TINY  = 1
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 99502c9c40..3ddaa3b4fb 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,4 +1,4 @@
-*SVN*
+*2.0.0* (December 6th, 2007)
 
 * Add warning to documentation about using transactional fixtures when the code under test uses transactions itself. Closes #7548 [thijsv]
 
@@ -10,9 +10,6 @@
 
 * Generated fixtures should not specify ids since theyre expected to be foxy fixtures #10330 [jbarnette]
 
-
-*2.0.0 [RC2]* (November 28th, 2007)
-
 * Update to Prototype -r8232.  [sam]
 
 * Introduce SecretKeyGenerator for more secure session secrets than CGI::Session's pseudo-random id generator. Consider extracting to Active Support later.  #10286 [Hongli Lai]
diff --git a/railties/Rakefile b/railties/Rakefile
index ea2a2c8d66..5e89a1b42c 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -312,11 +312,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.7.2')
-  s.add_dependency('activesupport',    '= 1.99.1' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.99.1' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.99.1' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 1.99.1' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 1.99.1' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.0.0' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.0.0' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.0.0' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.0.0' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.0.0' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 5d4d6a0328..db1f8a1c63 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,8 +1,8 @@
 module Rails
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 99
-    TINY  = 1
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end