[activemq] branch activemq-5.15.x updated: [AMQ-8025] Improve ActiveMQ feature to avoid mistake to use Spring 5

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
     new 0e790a1  [AMQ-8025] Improve ActiveMQ feature to avoid mistake to use Spring 5
0e790a1 is described below

commit 0e790a1b674f9cba815f24688e0cfe71e007a6a3
Author: jbonofre <jb...@apache.org>
AuthorDate: Sun Nov 22 14:13:58 2020 +0100

    [AMQ-8025] Improve ActiveMQ feature to avoid mistake to use Spring 5
    
    (cherry picked from commit 5a54d03f96402fd1c1c2b3189dd363e7ed1e2685)
---
 activemq-karaf/src/main/resources/features-core.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 43e76fc..4f335d1 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -20,8 +20,7 @@
 
 <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,6)/xml/features</repository> -->
+    <repository>mvn:org.apache.karaf.features/spring-legacy/[4,5)/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">