From ae032f719dc44e0bb53bf3a4f99702c3d09ec2f5 Mon Sep 17 00:00:00 2001
From: annjoy <annmariyajoy@gmail.com>
Date: Thu, 15 Jan 2026 01:26:37 +0530
Subject: [PATCH 1/4] update the version of org.apache.activemq.artemis

---
 pom.xml                                               | 2 +-
 uberfire-structure/uberfire-structure-backend/pom.xml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 69f333d9fa..d7d278a158 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
 
     <version.org.jboss.jboss-msc>1.2.7.SP1</version.org.jboss.jboss-msc>
 
-    <version.org.apache.activemq.artemis>2.19.1</version.org.apache.activemq.artemis>
+    <version.org.apache.activemq.artemis>2.38.0</version.org.apache.activemq.artemis>
     <netty-transport-native-epoll-classifier>linux-x86_64</netty-transport-native-epoll-classifier>
     <netty-transport-native-kqueue-classifier>osx-x86_64</netty-transport-native-kqueue-classifier>
 
diff --git a/uberfire-structure/uberfire-structure-backend/pom.xml b/uberfire-structure/uberfire-structure-backend/pom.xml
index c849864127..21e3650911 100644
--- a/uberfire-structure/uberfire-structure-backend/pom.xml
+++ b/uberfire-structure/uberfire-structure-backend/pom.xml
@@ -19,6 +19,10 @@
       <groupId>jakarta.json</groupId>
       <artifactId>jakarta.json-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>jakarta.json</artifactId>
+    </dependency>
     <dependency>
       <groupId>jakarta.ejb</groupId>
       <artifactId>jakarta.ejb-api</artifactId>

From f41085f0a2350af017b29bc5bdc3eac4be514100 Mon Sep 17 00:00:00 2001
From: annjoy <annmariyajoy@gmail.com>
Date: Wed, 21 Jan 2026 19:34:15 +0530
Subject: [PATCH 2/4] Exclude duplicate BouncyCastle dependencies from Keycloak
 adapter

---
 .../uberfire-security-management-keycloak/pom.xml           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml b/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml
index ac8f6da4ec..0345a414ad 100644
--- a/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml
+++ b/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml
@@ -129,6 +129,12 @@
     <dependency>
       <groupId>org.keycloak</groupId>
       <artifactId>keycloak-adapter-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>

From c5860ec2d38b2ac6349fec0018090dbfc25142c8 Mon Sep 17 00:00:00 2001
From: annjoy <annmariyajoy@gmail.com>
Date: Thu, 22 Jan 2026 00:25:52 +0530
Subject: [PATCH 3/4] Exclude duplicate BouncyCastle dependencies

---
 .../uberfire-metadata-commons-io/pom.xml               |  8 ++++++++
 .../uberfire-security-management-keycloak/pom.xml      | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/uberfire-extensions/uberfire-metadata/uberfire-metadata-commons-io/pom.xml b/uberfire-extensions/uberfire-metadata/uberfire-metadata-commons-io/pom.xml
index d6a2ea13e3..cfc5d7aa6c 100644
--- a/uberfire-extensions/uberfire-metadata/uberfire-metadata-commons-io/pom.xml
+++ b/uberfire-extensions/uberfire-metadata/uberfire-metadata-commons-io/pom.xml
@@ -178,6 +178,14 @@
           <groupId>javax.ws.rs</groupId>
           <artifactId>javax.ws.rs-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml b/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml
index 0345a414ad..8f28007872 100644
--- a/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml
+++ b/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml
@@ -132,7 +132,15 @@
       <exclusions>
         <exclusion>
           <groupId>org.bouncycastle</groupId>
-          <artifactId>*</artifactId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcutil-jdk15on</artifactId>
         </exclusion>
       </exclusions>
     </dependency>

From 1e4c52c7f3dc60c71cdd2814d6cceb0f8f8973b0 Mon Sep 17 00:00:00 2001
From: annjoy <annmariyajoy@gmail.com>
Date: Fri, 20 Mar 2026 16:14:01 +0530
Subject: [PATCH 4/4] Exclude duplicate BouncyCastle dependencies

---
 pom.xml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/pom.xml b/pom.xml
index d7d278a158..3aac251268 100644
--- a/pom.xml
+++ b/pom.xml
@@ -787,17 +787,51 @@
         <groupId>org.keycloak</groupId>
         <artifactId>keycloak-core</artifactId>
         <version>${version.org.keycloak}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.keycloak</groupId>
         <artifactId>keycloak-common</artifactId>
         <version>${version.org.keycloak}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
         <groupId>org.keycloak</groupId>
         <artifactId>keycloak-adapter-core</artifactId>
         <version>${version.org.keycloak}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcutil-jdk15on</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>