Merge pull request #9037 from tvpartytonight/PUP-11716

(PUP-11716) Update for jruby 9.4 and mri ruby >= 3.1.0

Author: joshcooper

.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |s|
   s.version = mdata ? mdata[1] : version
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1")
-  # Bump this in PUP-11716
-  s.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  s.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
   s.authors = ["Puppet Labs"]
   s.date = "2012-08-17"
   s.description = "Puppet, an automated configuration management tool"

.github/workflows/checks.yaml

@@ -16,9 +16,9 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - {check: rubocop, os: ubuntu-latest, ruby: '2.7'}
-          - {check: commits, os: ubuntu-latest, ruby: '2.7'}
-          - {check: warnings, os: ubuntu-latest, ruby: '2.7'}
+          - {check: rubocop, os: ubuntu-latest, ruby: '3.1'}
+          - {check: commits, os: ubuntu-latest, ruby: '3.1'}
+          - {check: warnings, os: ubuntu-latest, ruby: '3.1'}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:

.github/workflows/mend.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.1
       - name: Create lock
         run: bundle lock
       - uses: actions/setup-java@v3

.github/workflows/rspec_tests.yaml

@@ -16,13 +16,11 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - {os: ubuntu-latest, ruby: '2.7'}
-          - {os: ubuntu-latest, ruby: '3.0'}
+          - {os: ubuntu-latest, ruby: '3.1'}
           - {os: ubuntu-20.04, ruby: '3.2'} # openssl 1.1.1
           - {os: ubuntu-22.04, ruby: '3.2'} # openssl 3
-          - {os: ubuntu-latest, ruby: 'jruby-9.2.21.0'}
-          - {os: windows-2019, ruby: '2.7'}
-          - {os: windows-2019, ruby: '3.0'}
+          - {os: ubuntu-latest, ruby: 'jruby-9.4.2.0'}
+          - {os: windows-2019, ruby: '3.1'}
           - {os: windows-2019, ruby: '3.2'} # openssl 3
 
     runs-on: ${{ matrix.cfg.os }}

lib/puppet.rb

@@ -1,12 +1,11 @@
 require_relative 'puppet/version'
 require_relative 'puppet/concurrent/synchronized'
 
-# Update JRuby version constraints in PUP-11716
-if !defined?(JRUBY_VERSION) && Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("2.7.0")
-  raise LoadError, "Puppet #{Puppet.version} requires Ruby 2.7.0 or greater, found Ruby #{RUBY_VERSION.dup}."
+Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '3.1.0'
+if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new(Puppet::OLDEST_RECOMMENDED_RUBY_VERSION)
+  raise LoadError, "Puppet #{Puppet.version} requires Ruby #{Puppet::OLDEST_RECOMMENDED_RUBY_VERSION} or greater, found Ruby #{RUBY_VERSION.dup}."
 end
 
-Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '2.7.0'
 
 $LOAD_PATH.extend(Puppet::Concurrent::Synchronized)
 

spec/unit/ssl/ssl_provider_spec.rb

@@ -299,6 +299,7 @@
     end
 
     it 'raises if client cert signature is invalid' do
+      client_cert.public_key = wrong_key.public_key
       client_cert.sign(wrong_key, OpenSSL::Digest::SHA256.new)
       expect {
         subject.create_context(**config.merge(client_cert: client_cert))
@@ -339,6 +340,7 @@
 
     it 'raises if intermediate CA signature is invalid' do
       int = global_cacerts.last
+      int.public_key = wrong_key.public_key if Puppet::Util::Platform.jruby?
       int.sign(wrong_key, OpenSSL::Digest::SHA256.new)
 
       expect {