(maint) Merge up upstream/7.x to main

* upstream/7.x:
  (maint) Bump to jruby 9.2.21.0
  (packaging) Updating manpage file for 7.x

Author: joshcooper

.github/workflows/rspec_tests.yaml

@@ -20,7 +20,7 @@ jobs:
           - {os: ubuntu-latest, ruby: '2.6'}
           - {os: ubuntu-latest, ruby: '2.7'}
           - {os: ubuntu-latest, ruby: '3.0'}
-          - {os: ubuntu-latest, ruby: 'jruby-9.2.17.0'}
+          - {os: ubuntu-latest, ruby: 'jruby-9.2.21.0'}
           - {os: windows-2019, ruby: '2.5'}
           - {os: windows-2019, ruby: '2.6'}
           - {os: windows-2019, ruby: '2.7'}

spec/unit/file_system_spec.rb

@@ -819,9 +819,11 @@ def increment_counter_in_multiple_processes(file, num_procs, options)
         mode = Puppet::FileSystem.stat(dir).mode
         Puppet::FileSystem.chmod(0, dir)
         begin
+          # JRuby 9.2.21.0 drops the path from the message..
+          message = Puppet::Util::Platform.jruby? ? /^Permission denied/ : /^Permission denied .* #{path}/
           expect {
             Puppet::FileSystem.unlink(path)
-          }.to raise_error(Errno::EACCES, /^Permission denied .* #{path}/)
+          }.to raise_error(Errno::EACCES, message)
         ensure
           Puppet::FileSystem.chmod(mode, dir)
         end