From 5c9d79e3fb474c583522bda978a620ffee782975 Mon Sep 17 00:00:00 2001
From: Vishesh <vishesh92@gmail.com>
Date: Tue, 30 Apr 2024 18:23:51 +0530
Subject: [PATCH 1/3] Upgrade org.json:json version (#8750)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bbbb3d561be..cff8af3e422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
         <cs.joda-time.version>2.12.5</cs.joda-time.version>
         <cs.jpa.version>2.2.1</cs.jpa.version>
         <cs.jsch.version>0.1.55</cs.jsch.version>
-        <cs.json.version>20090211</cs.json.version>
+        <cs.json.version>20231013</cs.json.version>
         <cs.jstl.version>1.2</cs.jstl.version>
         <cs.kafka-clients.version>2.7.0</cs.kafka-clients.version>
         <cs.libvirt-java.version>0.5.3</cs.libvirt-java.version>

From 981310c2fe7e4e2cd87b44097a79938e56d9a744 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Tue, 30 Apr 2024 09:20:41 -0400
Subject: [PATCH 2/3] UI: Fix the Add / Remove Vmware DC button on Zone detail
 view (#8781)

* UI: Fix the Add / Remove Vmware DC button on Zone detail view

* hide the button for non vmware envs
---
 ui/src/views/AutogenView.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index be6c0f24cd1..6fa8a3e0848 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -989,6 +989,12 @@ export default {
         }
         this.itemCount = apiItemCount
 
+        if (this.dataView && this.$route.path.includes('/zone/') && 'listVmwareDcs' in this.$store.getters.apis) {
+          api('listVmwareDcs', { zoneid: this.items[0].id }).then(response => {
+            this.items[0].vmwaredc = response.listvmwaredcsresponse.VMwareDC
+          })
+        }
+
         if (['listTemplates', 'listIsos'].includes(this.apiName) && this.items.length > 1) {
           this.items = [...new Map(this.items.map(x => [x.id, x])).values()]
         }

From d1ca79b65b3a3a3ac2e3ca166acca62ae2cb1f18 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Tue, 30 Apr 2024 19:13:16 +0530
Subject: [PATCH 3/3] ui: show systemvm agent version in the list and resource
 view (#9011)

This adds changes to show the systemvm agent version in the list and
resource view.

Fixes #6831

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 ui/src/config/section/infra/systemVms.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/config/section/infra/systemVms.js b/ui/src/config/section/infra/systemVms.js
index e48b19cb5d4..68a27f73a52 100644
--- a/ui/src/config/section/infra/systemVms.js
+++ b/ui/src/config/section/infra/systemVms.js
@@ -24,8 +24,8 @@ export default {
   icon: 'thunderbolt-outlined',
   docHelp: 'adminguide/systemvm.html',
   permission: ['listSystemVms'],
-  columns: ['name', 'state', 'agentstate', 'systemvmtype', 'publicip', 'privateip', 'linklocalip', 'hostname', 'zonename'],
-  details: ['name', 'id', 'agentstate', 'systemvmtype', 'publicip', 'privateip', 'linklocalip', 'gateway', 'hostname', 'zonename', 'created', 'activeviewersessions', 'isdynamicallyscalable', 'hostcontrolstate'],
+  columns: ['name', 'state', 'agentstate', 'systemvmtype', 'publicip', 'privateip', 'linklocalip', 'version', 'hostname', 'zonename'],
+  details: ['name', 'id', 'agentstate', 'systemvmtype', 'publicip', 'privateip', 'linklocalip', 'gateway', 'hostname', 'version', 'zonename', 'created', 'activeviewersessions', 'isdynamicallyscalable', 'hostcontrolstate'],
   resourceType: 'SystemVm',
   filters: () => {
     const filters = ['starting', 'running', 'stopping', 'stopped', 'destroyed', 'expunging', 'migrating', 'error', 'unknown', 'shutdown']