Repository: activemq Updated Branches: refs/heads/master e0ad700f2 -> 7eb25ec50
Revert "https://issues.apache.org/jira/browse/AMQ-6136"; This reverts commit 4ee29c363fbcc754f69ebc57b45f84a549f7d130. We need to remove the dependency on Spring DM before doing this Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/7eb25ec5 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/7eb25ec5 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/7eb25ec5 Branch: refs/heads/master Commit: 7eb25ec50bd3af931c6ae876d9f7bef09385ba43 Parents: e0ad700 Author: Christopher L. Shannon (cshannon) <[email protected]> Authored: Fri Jan 29 14:57:11 2016 +0000 Committer: Christopher L. Shannon (cshannon) <[email protected]> Committed: Fri Jan 29 14:57:11 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/7eb25ec5/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 13ccca5..c578e15 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,5)">spring</feature> + <feature version="[3.2,4)">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>
