From 39cd51f424b22e5fc4c0747925bd3acbce2be580 Mon Sep 17 00:00:00 2001
From: Clay Woods <Woods_Clay@ne.bah.com>
Date: Fri, 27 Sep 2024 08:50:19 -0700
Subject: [PATCH]  #356 Correct metadata and pdp client with the quarkus bom
 updates

---
 build-parent/pom.xml                             |  1 +
 .../templates/rbac.yaml                          |  3 ++-
 foundation/foundation-data-access/pom.xml        |  7 +++++++
 .../foundation-data-lineage-consumer/pom.xml     |  7 +++++++
 .../foundation-metadata-producer/pom.xml         | 16 ++++++++--------
 .../foundation-pdp-client-java/pom.xml           |  5 +++++
 6 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index a3202946a..b5f57006f 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -70,6 +70,7 @@
         <version.jakarta.cdi>4.0.1</version.jakarta.cdi>
         <version.jakarta.inject>2.0.1</version.jakarta.inject>
         <version.jakarta.annotation>3.0.0</version.jakarta.annotation>
+        <version.jakarta.wr.rs>3.1.0</version.jakarta.wr.rs>
         <version.javax.servlet>3.1.0</version.javax.servlet>
 
 <!--        Spark Default Dependencies.  See `spark-*` profiles below for alternative sets -->
diff --git a/extensions/extensions-helm/aissemble-spark-operator-chart/templates/rbac.yaml b/extensions/extensions-helm/aissemble-spark-operator-chart/templates/rbac.yaml
index 5d5938b26..bd49c01eb 100644
--- a/extensions/extensions-helm/aissemble-spark-operator-chart/templates/rbac.yaml
+++ b/extensions/extensions-helm/aissemble-spark-operator-chart/templates/rbac.yaml
@@ -38,6 +38,7 @@ rules:
   - delete
   - update
   - list
+  - patch
 - apiGroups:
   - extensions
   - networking.k8s.io
@@ -137,4 +138,4 @@ roleRef:
   kind: ClusterRole
   name: {{ include "spark-operator.fullname" (index .Subcharts "spark-operator") }}
   apiGroup: rbac.authorization.k8s.io
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/foundation/foundation-data-access/pom.xml b/foundation/foundation-data-access/pom.xml
index d635e136c..55393b96d 100644
--- a/foundation/foundation-data-access/pom.xml
+++ b/foundation/foundation-data-access/pom.xml
@@ -22,6 +22,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.boozallen.aissemble</groupId>
+                <artifactId>aissemble-quarkus-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-consumer/pom.xml b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-consumer/pom.xml
index ea49004db..b9b28f034 100644
--- a/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-consumer/pom.xml
+++ b/foundation/foundation-lineage/foundation-data-lineage/foundation-data-lineage-consumer/pom.xml
@@ -39,6 +39,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.boozallen.aissemble</groupId>
+                <artifactId>aissemble-quarkus-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/foundation/foundation-metadata/foundation-metadata-producer/pom.xml b/foundation/foundation-metadata/foundation-metadata-producer/pom.xml
index b66f69408..aaf5f2794 100644
--- a/foundation/foundation-metadata/foundation-metadata-producer/pom.xml
+++ b/foundation/foundation-metadata/foundation-metadata-producer/pom.xml
@@ -19,13 +19,13 @@
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
-                <exclusions>
-                    <!-- Quarkus 3.6 uses SmallRye Messaging 4.10, which is incompatible with 4.24. This causes issues for in-memory import -->
-                    <exclusion>
-                        <groupId>io.smallrye.reactive</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.boozallen.aissemble</groupId>
+                <artifactId>aissemble-quarkus-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
@@ -80,4 +80,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/foundation/foundation-security/foundation-pdp-client-java/pom.xml b/foundation/foundation-security/foundation-pdp-client-java/pom.xml
index 99813e2d5..3ccef5509 100644
--- a/foundation/foundation-security/foundation-pdp-client-java/pom.xml
+++ b/foundation/foundation-security/foundation-pdp-client-java/pom.xml
@@ -47,6 +47,11 @@
             <artifactId>resteasy-jaxb-provider</artifactId>
             <version>${version.resteasy}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>${version.jakarta.wr.rs}</version>
+        </dependency>
     </dependencies>
 
     <build>