From a3c01257aff8c48d21d6f918147dba233fbf8b7c Mon Sep 17 00:00:00 2001
From: Robbie Gemmell <robbie@apache.org>
Date: Tue, 11 Jul 2023 11:21:50 +0100
Subject: [PATCH] ARTEMIS-4331: update to jgroups 5.2.16, adjust deps to
 exclude BM

---
 artemis-features/src/main/resources/features.xml | 2 +-
 pom.xml                                          | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index 96e673b5e3..5ae4b60546 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -53,7 +53,7 @@
 		<bundle dependency="true">mvn:commons-beanutils/commons-beanutils/${commons.beanutils.version}</bundle>
 		<bundle dependency="true">mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
 
-		<bundle dependency="true">wrap:mvn:org.jgroups/jgroups/${jgroups.version}</bundle>
+		<bundle dependency="true">wrap:mvn:org.jgroups/jgroups/${jgroups.version}$Import-Package=org.jboss.byteman.*;resolution:=&quot;optional&quot;</bundle>
 	</feature>
 
 	<feature name="artemis-core" version="${pom.version}" description="ActiveMQ Artemis broker libraries">
diff --git a/pom.xml b/pom.xml
index 668e209245..8b98d340bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
       <jsr305.version>3.0.2</jsr305.version>
       <jetty.version>10.0.15</jetty.version>
       <tomcat.servlet-api.version>8.5.78</tomcat.servlet-api.version>
-      <jgroups.version>5.2.0.Final</jgroups.version>
+      <jgroups.version>5.2.16.Final</jgroups.version>
       <errorprone.version>2.20.0</errorprone.version>
       <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
       <maven.checkstyle.plugin.version>3.2.2</maven.checkstyle.plugin.version>
@@ -569,6 +569,13 @@
             <groupId>org.jgroups</groupId>
             <artifactId>jgroups</artifactId>
             <version>${jgroups.version}</version>
+            <exclusions>
+               <!-- Exclude BM utils: dont need, cant ship -->
+               <exclusion>
+                  <groupId>*</groupId>
+                  <artifactId>*</artifactId>
+               </exclusion>
+            </exclusions>
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>