Repository: camel Updated Branches: refs/heads/master 738b6097f -> 81d27e80f
CAMEL-7267: Error install camel-splunk in karaf if joda-time 1.x has been installed already. Need to open up the import version range. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/81d27e80 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/81d27e80 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/81d27e80 Branch: refs/heads/master Commit: 81d27e80fa5b4f315045296c5c29d7cb32b6530b Parents: 738b609 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Mar 4 16:11:32 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 4 16:11:32 2014 +0100 ---------------------------------------------------------------------- components/camel-splunk/pom.xml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/81d27e80/components/camel-splunk/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml index fb7c25c..7abd8db 100644 --- a/components/camel-splunk/pom.xml +++ b/components/camel-splunk/pom.xml @@ -31,6 +31,9 @@ <packaging>bundle</packaging> <properties> + <camel.osgi.import.before.defaults> + org.joda.time.*;version="[1.6,3)" + </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.component.splunk.*</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=splunk</camel.osgi.export.service> </properties> @@ -88,12 +91,4 @@ </dependency> </dependencies> - <!-- TODO: remove me when we use SMX bundle version for splunk --> - <repositories> - <repository> - <id>ext-release-local</id> - <url>http://splunk.artifactoryonline.com/splunk/ext-releases-local</url> - </repository> - </repositories> - </project>
