Merge pull request #855 from tlehman/PE38346

Remove base64 and nkf which conflict with default gems
puppetlabs · May 30, 2024 · dd06b4f · dd06b4f
2 parents 5df6088 + ab6b4da
commit dd06b4f
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 20 deletions.
diff --git a/configs/components/rubygem-base64.rb b/configs/components/rubygem-base64.rb
diff --git a/configs/components/rubygem-nkf.rb b/configs/components/rubygem-nkf.rb
diff --git a/configs/projects/_shared-pe-bolt-server.rb b/configs/projects/_shared-pe-bolt-server.rb
@@ -110,7 +110,6 @@
 proj.component('rubygem-aws-sdk-core')
 proj.component('rubygem-aws-sdk-ec2')
 proj.component('rubygem-aws-sigv4')
-proj.component('rubygem-base64')
 proj.component('rubygem-bcrypt_pbkdf')
 proj.component('rubygem-bindata')
 proj.component('rubygem-builder')
@@ -141,7 +140,6 @@
 proj.component('rubygem-net-scp')
 proj.component('rubygem-net-ssh')
 proj.component('rubygem-net-ssh-krb')
-proj.component('rubygem-nkf')
 proj.component('rubygem-rubyntlm')
 proj.component('rubygem-nori')
 proj.component('rubygem-orchestrator_client')

diff --git a/configs/projects/_shared-pe-bolt-server_with_ruby.rb b/configs/projects/_shared-pe-bolt-server_with_ruby.rb
@@ -145,7 +145,6 @@
 proj.component('rubygem-aws-sdk-core')
 proj.component('rubygem-aws-sdk-ec2')
 proj.component('rubygem-aws-sigv4')
-proj.component('rubygem-base64')
 proj.component('rubygem-bcrypt_pbkdf')
 proj.component('rubygem-bindata')
 proj.component('rubygem-builder')
@@ -176,7 +175,6 @@
 proj.component('rubygem-net-scp')
 proj.component('rubygem-net-ssh')
 proj.component('rubygem-net-ssh-krb')
-proj.component('rubygem-nkf')
 proj.component('rubygem-nori')
 proj.component('rubygem-rubyntlm')
 proj.component('rubygem-orchestrator_client')

diff --git a/configs/projects/_shared-pe-installer-runtime.rb b/configs/projects/_shared-pe-installer-runtime.rb
@@ -93,7 +93,6 @@
 proj.component('rubygem-aws-sdk-core')
 proj.component('rubygem-aws-sdk-ec2')
 proj.component('rubygem-aws-sigv4')
-proj.component('rubygem-base64')
 proj.component('rubygem-bcrypt_pbkdf')
 proj.component('rubygem-bindata')
 proj.component('rubygem-builder')
@@ -122,7 +121,6 @@
 proj.component('rubygem-net-http-persistent')
 proj.component('rubygem-net-scp')
 proj.component('rubygem-net-ssh-krb')
-proj.component('rubygem-nkf')
 proj.component('rubygem-nori')
 proj.component('rubygem-rubyntlm')
 proj.component('rubygem-orchestrator_client')

diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb
@@ -162,7 +162,6 @@
   proj.component 'rubygem-aws-sdk-core'
   proj.component 'rubygem-aws-sdk-ec2'
   proj.component 'rubygem-aws-sigv4'
-  proj.component 'rubygem-base64'
   proj.component 'rubygem-bindata'
   proj.component 'rubygem-builder'
   proj.component 'rubygem-CFPropertyList'
@@ -190,7 +189,6 @@
   proj.component 'rubygem-net-scp'
   proj.component 'rubygem-net-ssh'
   proj.component 'rubygem-net-ssh-krb'
-  proj.component 'rubygem-nkf'
   proj.component 'rubygem-nori'
   proj.component 'rubygem-orchestrator_client'
   proj.component 'rubygem-paint'