From 5adfc4130c1e8a649219d90bfbced1de0b336e7b Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Mon, 20 May 2024 08:45:17 -0700 Subject: [PATCH 1/2] Revert "Restrict to rexml 3.2.0 - 3.2.6" This reverts commit 0b561ef584de71447a33fb56d93c6d2001d34d22. --- facter.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/facter.gemspec b/facter.gemspec index f3fab6e2f7..2be6a90202 100644 --- a/facter.gemspec +++ b/facter.gemspec @@ -37,7 +37,6 @@ Gem::Specification.new do |spec| # ffi 1.16.0 - 1.16.2 are broken on Windows spec.add_development_dependency 'ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2' spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6' - spec.add_development_dependency 'rexml', '>= 3.2.0', '<= 3.2.6' spec.add_development_dependency 'rspec', '~> 3.0' spec.add_development_dependency 'rubocop', '~> 1.28' # last version to support 2.5 spec.add_development_dependency 'rubocop-performance', '~> 1.5.2' From 88da88890dc38ded40d5e2fd445bb1ffa2129718 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Mon, 20 May 2024 08:46:34 -0700 Subject: [PATCH 2/2] Bump GH action to JRuby 9.3.14.0 JRuby 9.3.11.0 added support for passing a string to StringScanner#scan, which rexml 3.2.7 and up rely on. We're currently shipping puppetserver with 9.3.14, so bump to that version. --- .github/workflows/unit_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index e07d237ea0..dd8b40859d 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -22,7 +22,7 @@ jobs: - '2.7' - '3.0' - '3.2' - - 'jruby-9.3.9.0' + - 'jruby-9.3.14.0' runs-on: ubuntu-20.04 steps: - name: Checkout current PR