From 856934f8252d414378e9c17a56573db50c5784a5 Mon Sep 17 00:00:00 2001
From: Samuel Williams <samuel.williams@oriontransfer.co.nz>
Date: Wed, 3 Aug 2022 15:46:01 +1200
Subject: Bump version to "3.0.0". (#1940)

---
 lib/rack/server.rb   |  2 +-
 lib/rack/version.rb  | 12 ++++++++----
 test/spec_server.rb  |  2 +-
 test/spec_version.rb |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/rack/server.rb b/lib/rack/server.rb
index cf361a94..d68ca89f 100644
--- a/lib/rack/server.rb
+++ b/lib/rack/server.rb
@@ -119,7 +119,7 @@ module Rack
           end
 
           opts.on_tail("--version", "Show version") do
-            puts "Rack #{Rack.version} (Release: #{Rack.release})"
+            puts "Rack #{Rack.release}"
             exit
           end
         end
diff --git a/lib/rack/version.rb b/lib/rack/version.rb
index cbb6dca4..782eb981 100644
--- a/lib/rack/version.rb
+++ b/lib/rack/version.rb
@@ -14,14 +14,18 @@
 module Rack
   # The Rack protocol version number implemented.
   VERSION = [1, 3].freeze
-  VERSION_STRING = VERSION.join(".").freeze
+  deprecate_constant :VERSION
 
-  # Return the Rack protocol version as a dotted string.
+  VERSION_STRING = "1.3".freeze
+  deprecate_constant :VERSION_STRING
+
+  # The Rack protocol version number implemented.
   def self.version
-    VERSION_STRING
+    warn "Rack.version is deprecated and will be removed in Rack 3.1!", uplevel: 1
+    VERSION
   end
 
-  RELEASE = "2.3.0"
+  RELEASE = "3.0.0"
 
   # Return the Rack release as a dotted string.
   def self.release
diff --git a/test/spec_server.rb b/test/spec_server.rb
index 7e4850b4..e5265769 100644
--- a/test/spec_server.rb
+++ b/test/spec_server.rb
@@ -275,7 +275,7 @@ describe Rack::Server do
   end
 
   it "support -v option to get version" do
-    test_options_server('-v').must_match(/\ARack \d\.\d \(Release: \d+\.\d+\.\d+\)\nexited\z/)
+    test_options_server('-v').must_match(/\ARack \d+\.\d+.\d+\nexited\z/)
   end
 
   it "warn for invalid --profile-mode option" do
diff --git a/test/spec_version.rb b/test/spec_version.rb
index d9be54d2..bdd903d1 100644
--- a/test/spec_version.rb
+++ b/test/spec_version.rb
@@ -8,8 +8,8 @@ end
 
 describe Rack do
   describe 'version' do
-    it 'defaults to a hard-coded api version' do
-      Rack.version.must_equal "1.3"
+    it 'is a version string' do
+      Rack::RELEASE.must_match(/\d+\.\d+\.\d+/)
     end
   end
 end
-- 
cgit v1.2.3-24-ge0c7