Merge branch 'puppetlabs:master' into master

puppetlabs · Aug 12, 2024 · 189e9b8 · 189e9b8
2 parents 2c41681 + 8402339
commit 189e9b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/configs/components/rubygem-getoptlong.rb b/configs/components/rubygem-getoptlong.rb
@@ -0,0 +1,6 @@
+component 'rubygem-getoptlong' do |pkg, settings, platform|
+ pkg.version '0.2.0'
+ pkg.md5sum '91760bf343765c5d3f08cb5393d90487'
+
+ instance_eval File.read('configs/components/_base-rubygem.rb')
+end
diff --git a/configs/projects/pe-bolt-server-runtime-main.rb b/configs/projects/pe-bolt-server-runtime-main.rb
@@ -19,6 +19,10 @@
  end
 
  instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-bolt-server_with_ruby.rb'))
+ # These are ruby 3/puppet 8 specific gems. Some of them are "default/standard" gems. There
+ # is a very annoying issue where default gems can be loaded by MRI but not jruby. 
+ # We explicitly pacakge up some default gems where we have explicit dependencies for jruby
  proj.component 'rubygem-prime'
  proj.component 'rubygem-rexml'
+ proj.component 'rubygem-getoptlong'
 end