Repository: activemq Updated Branches: refs/heads/activemq-5.12.x 618e166b2 -> df3a81067
[AMQ-6597] Do not add the camel component decriptors to activemq-osgi Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/df3a8106 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/df3a8106 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/df3a8106 Branch: refs/heads/activemq-5.12.x Commit: df3a81067c58cfa27cdc8f175ca9c31ee7f04496 Parents: 618e166 Author: Christian Schneider <[email protected]> Authored: Wed Feb 15 14:25:55 2017 +0100 Committer: Christian Schneider <[email protected]> Committed: Wed Feb 15 14:27:25 2017 +0100 ---------------------------------------------------------------------- activemq-osgi/pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/df3a8106/activemq-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index 33f1933..e6db99d 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -162,6 +162,11 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>activemq-web</artifactId> + <exclusions> + <exclusion> + <artifactId>activemq-all</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -300,7 +305,6 @@ <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <configuration> - <excludeDependencies>activemq-all;scope=compile|runtime</excludeDependencies> <instructions> <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator> <Embed-Dependency>
