Repository: activemq Updated Branches: refs/heads/activemq-5.13.x adc3ba49c -> 957fb8578
https://issues.apache.org/jira/browse/AMQ-6136 Switching the version for Spring in features-core.xml to allow Spring 4.x versions. (cherry picked from commit 4ee29c363fbcc754f69ebc57b45f84a549f7d130) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/957fb857 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/957fb857 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/957fb857 Branch: refs/heads/activemq-5.13.x Commit: 957fb85786214e1817db98ca238d5444898ea077 Parents: adc3ba4 Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Thu Jan 21 16:09:30 2016 +0000 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Thu Jan 21 16:11:07 2016 +0000 ---------------------------------------------------------------------- activemq-karaf/src/main/resources/features-core.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/957fb857/activemq-karaf/src/main/resources/features-core.xml ---------------------------------------------------------------------- diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml index c578e15..13ccca5 100644 --- a/activemq-karaf/src/main/resources/features-core.xml +++ b/activemq-karaf/src/main/resources/features-core.xml @@ -22,7 +22,7 @@ <!-- 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="[3.2,4)">spring</feature> + <feature version="[3.2,5)">spring</feature> <feature>spring-dm</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>
