From 34432e2b7ac13f45540cf709bf02058498b5de51 Mon Sep 17 00:00:00 2001
From: Matt Pavlovich <mattrpav@apache.org>
Date: Tue, 9 Apr 2024 09:59:03 -0500
Subject: [PATCH] [AMQ-9474] Update activemq-osgi import for Spring 6

---
 activemq-osgi/pom.xml | 6 +++---
 pom.xml               | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index f5022a6790..1943c0f530 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -180,9 +180,9 @@
               org.jasypt*;resolution:=optional,
               org.eclipse.jetty*;resolution:=optional;version="[9.0,10)",
               org.fusesource.hawtjni*;resolution:=optional,
-              org.springframework.jms*;version="[4,6)";resolution:=optional,
-              org.springframework.transaction*;version="[4,6)";resolution:=optional,
-              org.springframework*;version="[4,6)";resolution:=optional,
+              org.springframework.jms*;version="${spring-version-range}";resolution:=optional,
+              org.springframework.transaction*;version="${spring-version-range}";resolution:=optional,
+              org.springframework*;version="${spring-version-range}";resolution:=optional,
               org.xmlpull*;resolution:=optional,
               !javax.annotation.meta,
               javax.annotation*;version="[1,4)",
diff --git a/pom.xml b/pom.xml
index 652c7d77bd..9fd7908e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,7 @@
     <slf4j-version>2.0.12</slf4j-version>
     <snappy-version>1.1.2</snappy-version>
     <spring-version>6.1.5</spring-version>
+    <spring-version-range>[6,7)</spring-version-range>
     <taglibs-version>1.2.5</taglibs-version>
     <velocity-version>2.3</velocity-version>
     <xpp3-version>1.1.4c</xpp3-version>