From 640a6afa49a1addd73f0f986b79138a5f5be775f Mon Sep 17 00:00:00 2001
From: skyamgarp <130442619+skyamgarp@users.noreply.github.com>
Date: Fri, 8 Nov 2024 07:54:53 +0530
Subject: [PATCH] (PA-7105) Remove rubygem-rexml component from main and add
 only to 7.x

---
 configs/projects/_shared-agent-components.rb | 5 -----
 configs/projects/agent-runtime-7.x.rb        | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configs/projects/_shared-agent-components.rb b/configs/projects/_shared-agent-components.rb
index 39feda9be..8834028c1 100644
--- a/configs/projects/_shared-agent-components.rb
+++ b/configs/projects/_shared-agent-components.rb
@@ -62,11 +62,6 @@
 proj.component 'rubygem-fast_gettext'
 proj.component 'rubygem-ffi'
 
-# We add rexml explicitly in here because even though ruby 3 ships with rexml as its default gem, the version
-# of rexml it ships with contains CVE-2024-41946, CVE-2024-41123, CVE-2024-35176 and CVE-2024-39908.
-# So, we add it here to update to a higher version
-# free from the CVEs.
-proj.component 'rubygem-rexml'
 
 if platform.is_windows? || platform.is_solaris? || platform.is_aix?
   proj.component 'rubygem-minitar'
diff --git a/configs/projects/agent-runtime-7.x.rb b/configs/projects/agent-runtime-7.x.rb
index 93f45363a..edda69e0f 100644
--- a/configs/projects/agent-runtime-7.x.rb
+++ b/configs/projects/agent-runtime-7.x.rb
@@ -61,6 +61,12 @@
   proj.component 'rubygem-thor'
   proj.component 'rubygem-scanf'
 
+  # We add rexml explicitly in here because even though ruby 3 ships with rexml as its default gem, the version
+  # of rexml it ships with contains CVE-2024-41946, CVE-2024-41123, CVE-2024-35176 and CVE-2024-39908.
+  # So, we add it here to update to a higher version
+  # free from the CVEs.
+  proj.component 'rubygem-rexml'
+
   if platform.is_linux?
     proj.component "virt-what"
     proj.component "dmidecode" unless platform.architecture =~ /ppc64/