From c628357f91c5f4f71b9106b30a43ea86230c6044 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 5 Feb 2019 11:40:54 +0100
Subject: [PATCH] AMQ-7146 - Support Spring 5 in OSGi

---
 activemq-camel/pom.xml                              | 2 +-
 activemq-karaf/src/main/resources/features-core.xml | 4 ++--
 activemq-osgi/pom.xml                               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index ff7465a577..e2149968ce 100644
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -32,7 +32,7 @@
 
   <properties>
     <activemq.osgi.import.pkg>
-       org.springframework.jms*;version="[4,5)",
+       org.springframework.jms*;version="[4,6)",
        org.apache.activemq.pool,
        org.apache.camel*;version="${camel-version-range}",
        *
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 789a991424..53314c0015 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -21,11 +21,11 @@
 <features name="activemq-core-${project.version}">
 
     <!-- In order to work with any Karaf version, the user has to add spring-legacy features repo by hand corresponding to his Karaf version -->
-    <!-- <repository>mvn:org.apache.karaf.features/spring-legacy/[4,5)/xml/features</repository> -->
+    <!-- <repository>mvn:org.apache.karaf.features/spring-legacy/[4,6)/xml/features</repository> -->
 
     <!-- Bundles needed if only client will be deployed in the container -->
     <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}" resolver="(obr)" start-level="50">
-        <feature version="[4,5)">spring</feature>
+        <feature version="[4,6)">spring</feature>
         <feature version="[4,5)">shell-compat</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 9acd6374bd..613daf08cd 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -57,9 +57,9 @@
       org.apache.zookeeper*;resolution:=optional,
       org.fusesource.leveldbjni*;resolution:=optional,
       org.fusesource.hawtjni*;resolution:=optional,
-      org.springframework.jms*;version="[4,5)";resolution:=optional,
-      org.springframework.transaction*;version="[4,5)";resolution:=optional,
-      org.springframework*;version="[4,5)";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.xmlpull*;resolution:=optional,
       scala*;resolution:=optional,
       javax.annotation*,