From 6efc37a4e355312a9bd2e33787c8d1d00e3ce861 Mon Sep 17 00:00:00 2001
From: Kunal Shroff <kunalshroff9@gmail.com>
Date: Mon, 4 Aug 2025 10:52:22 -0400
Subject: [PATCH 1/2] Add qserver dependencies to the phoebus target

---
 dependencies/phoebus-target/pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml
index a3bbb29dfa..6cdfd64a5e 100644
--- a/dependencies/phoebus-target/pom.xml
+++ b/dependencies/phoebus-target/pom.xml
@@ -498,6 +498,19 @@
       <version>2.1</version>
     </dependency>
 
+    <!-- required but Qserver applications -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+      <version>2.19.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.poi</groupId>
+      <artifactId>poi</artifactId>
+      <version>5.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- https://mvnrepository.com/artifact/org.apache.activemq/activemq-client -->
     <dependency>
       <groupId>org.apache.activemq</groupId>

From 1814dc88b159c66cd5cf845a65a190da055a9a05 Mon Sep 17 00:00:00 2001
From: Kunal Shroff <kunalshroff9@gmail.com>
Date: Mon, 4 Aug 2025 14:55:17 -0400
Subject: [PATCH 2/2] remove duplicate dependency def

---
 app/queue-server/pom.xml            | 28 +++++++++++++++++++++++++++-
 dependencies/phoebus-target/pom.xml |  6 ------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/queue-server/pom.xml b/app/queue-server/pom.xml
index 85ed682bee..5e97e07249 100644
--- a/app/queue-server/pom.xml
+++ b/app/queue-server/pom.xml
@@ -37,8 +37,34 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.zaxxer</groupId>
+                    <artifactId>SparseBitSet</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-collections4</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-math3</artifactId>
+                </exclusion>
+            </exclusions>
             <version>5.0.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml
index 6cdfd64a5e..f8092396ee 100644
--- a/dependencies/phoebus-target/pom.xml
+++ b/dependencies/phoebus-target/pom.xml
@@ -504,12 +504,6 @@
       <artifactId>jackson-dataformat-yaml</artifactId>
       <version>2.19.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi</artifactId>
-      <version>5.0.0</version>
-      <scope>compile</scope>
-    </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.apache.activemq/activemq-client -->
     <dependency>