8 files changed, 16 insertions, 16 deletions
diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb
index a4bd11cae3..c9dff0704c 100644
--- a/lib/rubygems/basic_specification.rb
+++ b/lib/rubygems/basic_specification.rb
@@ -41,7 +41,7 @@ class Gem::BasicSpecification
   class << self
 
     extend Gem::Deprecate
-    deprecate :default_specifications_dir, "Gem.default_specifications_dir", 2020, 02
+    deprecate :default_specifications_dir, "Gem.default_specifications_dir"
 
   end
 
diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb
index 9d7f1b287f..ed245f1b8f 100644
--- a/lib/rubygems/commands/query_command.rb
+++ b/lib/rubygems/commands/query_command.rb
@@ -6,7 +6,7 @@ require 'rubygems/deprecate'
 class Gem::Commands::QueryCommand < Gem::Command
 
   extend Gem::Deprecate
-  deprecate_command(2020, 12)
+  deprecate_command
 
   include Gem::QueryUtils
 
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb
index fe89b0063d..082a6cedfa 100644
--- a/lib/rubygems/dependency_installer.rb
+++ b/lib/rubygems/dependency_installer.rb
@@ -195,7 +195,7 @@ class Gem::DependencyInstaller
 
     set
   end
-  deprecate :find_gems_with_sources, :none, 2020, 12
+  deprecate :find_gems_with_sources
 
   def in_background(what) # :nodoc:
     fork_happened = false
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index abb7048b00..eb63029bd9 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -422,7 +422,7 @@ class Gem::Installer
     @gem_dir = directory
     extract_files
   end
-  deprecate :unpack, :none, 2020, 04
+  deprecate :unpack
 
   ##
   # The location of the spec file that is installed.
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index 6c37555dd0..ac44f73e98 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -720,7 +720,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Deprecated: You must now specify the executable name to  Gem.bin_path.
 
   attr_writer :default_executable
-  deprecate :default_executable=, :none, 2018, 12
+  deprecate :default_executable=
 
   ##
   # Allows deinstallation of gems with legacy platforms.
@@ -733,7 +733,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Formerly used to set rubyforge project.
 
   attr_writer :rubyforge_project
-  deprecate :rubyforge_project=, :none, 2019, 12
+  deprecate :rubyforge_project=
 
   ##
   # The Gem::Specification version of this gemspec.
@@ -1725,7 +1725,7 @@ class Gem::Specification < Gem::BasicSpecification
     end
     result
   end
-  deprecate :default_executable, :none, 2018, 12
+  deprecate :default_executable
 
   ##
   # The default value for specification attribute +name+
@@ -1928,7 +1928,7 @@ class Gem::Specification < Gem::BasicSpecification
   def has_rdoc # :nodoc:
     true
   end
-  deprecate :has_rdoc, :none, 2018, 12
+  deprecate :has_rdoc
 
   ##
   # Deprecated and ignored.
@@ -1938,10 +1938,10 @@ class Gem::Specification < Gem::BasicSpecification
   def has_rdoc=(ignored) # :nodoc:
     @has_rdoc = true
   end
-  deprecate :has_rdoc=, :none, 2018, 12
+  deprecate :has_rdoc=
 
   alias :has_rdoc? :has_rdoc # :nodoc:
-  deprecate :has_rdoc?, :none, 2018, 12
+  deprecate :has_rdoc?
 
   ##
   # True if this gem has files in test_files
diff --git a/test/rubygems/test_deprecate.rb b/test/rubygems/test_deprecate.rb
index 6d36b673df..15b501d4d2 100644
--- a/test/rubygems/test_deprecate.rb
+++ b/test/rubygems/test_deprecate.rb
@@ -50,7 +50,7 @@ class TestDeprecate < Gem::TestCase
     def bar
       @message = "bar"
     end
-    deprecate :foo, :bar, 2099, 3
+    deprecate :foo, :bar
 
   end
 
@@ -70,7 +70,7 @@ class TestDeprecate < Gem::TestCase
 
     assert_equal "", out
     assert_match(/Thing#foo is deprecated; use bar instead\./, err)
-    assert_match(/on or after 2099-03-01/, err)
+    assert_match(/in Rubygems [0-9]+/, err)
   end
 
   def test_deprecate_command
@@ -78,7 +78,7 @@ class TestDeprecate < Gem::TestCase
     foo_command = Class.new(Gem::Command) do
       extend Gem::Deprecate
 
-      deprecate_command(2099, 4)
+      deprecate_command
 
       def execute
         puts "pew pew!"
diff --git a/test/rubygems/test_gem_command_manager.rb b/test/rubygems/test_gem_command_manager.rb
index c6aaff291a..497ff1e208 100644
--- a/test/rubygems/test_gem_command_manager.rb
+++ b/test/rubygems/test_gem_command_manager.rb
@@ -281,7 +281,7 @@ class TestGemCommandManager < Gem::TestCase
     foo_command = Class.new(Gem::Command) do
       extend Gem::Deprecate
 
-      deprecate_command(2099, 4)
+      deprecate_command
 
       def execute
         say "pew pew!"
@@ -296,7 +296,7 @@ class TestGemCommandManager < Gem::TestCase
     end
 
     assert_equal "pew pew!\n", @ui.output
-    assert_equal("WARNING:  foo command is deprecated. It will be removed on or after 2099-04-01.\n", @ui.error)
+    assert_match(/WARNING:  foo command is deprecated. It will be removed in Rubygems [0-9]+/, @ui.error)
   ensure
     Gem::Commands.send(:remove_const, :FooCommand)
   end
diff --git a/test/rubygems/test_gem_gem_runner.rb b/test/rubygems/test_gem_gem_runner.rb
index 5e4eda0516..c4917b0588 100644
--- a/test/rubygems/test_gem_gem_runner.rb
+++ b/test/rubygems/test_gem_gem_runner.rb
@@ -76,7 +76,7 @@ class TestGemGemRunner < Gem::TestCase
       assert_nil @runner.run(args)
     end
 
-    assert_equal "WARNING:  query command is deprecated. It will be removed on or after 2020-12-01.\n", @ui.error
+    assert_match /WARNING:  query command is deprecated. It will be removed in Rubygems [0-9]+/, @ui.error
   end
 
   def test_info_succeeds