Repository: activemq Updated Branches: refs/heads/trunk c70d75213 -> b1ede0559
[AMQ-5353] Use the same version range for the imports and the features.xml Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b1ede055 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b1ede055 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b1ede055 Branch: refs/heads/trunk Commit: b1ede0559e12e39ae8dc7d4eb0c1c5f8cb73be29 Parents: c70d752 Author: Daniel Kulp <[email protected]> Authored: Tue Sep 9 16:38:53 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Tue Sep 9 16:38:53 2014 -0400 ---------------------------------------------------------------------- activemq-camel/pom.xml | 3 ++- activemq-osgi/pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/b1ede055/activemq-camel/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml index 5f90187..3efebe8 100755 --- a/activemq-camel/pom.xml +++ b/activemq-camel/pom.xml @@ -34,10 +34,11 @@ <activemq.osgi.import.pkg> org.springframework.jms*;version="[3,4)", org.apache.activemq.pool, + org.apache.camel*;version="${camel-version-range}", * </activemq.osgi.import.pkg> <activemq.osgi.export> - org.apache.activemq.camel*;version=${project.version};-noimport:=true + org.apache.activemq.camel*;version:="${project.version}";-noimport:=true </activemq.osgi.export> </properties> http://git-wip-us.apache.org/repos/asf/activemq/blob/b1ede055/activemq-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index 839dc24..c56877a 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -42,7 +42,7 @@ com.thoughtworks.xstream*;resolution:=optional, org.apache.activeio*;resolution:=optional, org.apache.activemq.camel*;resolution:=optional, - org.apache.camel*;resolution:=optional, + org.apache.camel*;version:="${camel-version-range}";resolution:=optional, org.apache.derby.jdbc*;resolution:=optional, org.apache.geronimo.transaction.manager*;resolution:=optional, org.apache.hadoop*;resolution:=optional,
