Updated Branches: refs/heads/master ef4bed3f5 -> d0f7ce27c
CAMEL-6584: Added camel-splunk to features. Thanks to Preben for patch in pom.xml Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0f7ce27 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0f7ce27 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0f7ce27 Branch: refs/heads/master Commit: d0f7ce27cc840fa92f398436b08cca20cc6c19cd Parents: ef4bed3 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Oct 10 14:52:01 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Oct 10 14:52:01 2013 +0200 ---------------------------------------------------------------------- components/camel-splunk/pom.xml | 13 +++++-- parent/pom.xml | 1 + .../features/src/main/resources/features.xml | 6 +++ .../camel/itest/karaf/CamelSplunkTest.java | 40 ++++++++++++++++++++ 4 files changed, 56 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d0f7ce27/components/camel-splunk/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml index 0fdca67..fb7c25c 100644 --- a/components/camel-splunk/pom.xml +++ b/components/camel-splunk/pom.xml @@ -41,11 +41,16 @@ <artifactId>camel-core</artifactId> </dependency> - <!-- TODO: use SMX bundle version when its released --> <dependency> - <groupId>com.splunk</groupId> - <artifactId>splunk</artifactId> - <version>1.2.0</version> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.splunk</artifactId> + <version>${splunk-version}</version> + <exclusions> + <exclusion> + <artifactId>splunk</artifactId> + <groupId>com.splunk</groupId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/d0f7ce27/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 782b5c8..529d479 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -363,6 +363,7 @@ <snmp4j-version>2.2.2_1</snmp4j-version> <solr-bundle-version>4.4.0_1</solr-bundle-version> <solr-version>4.4.0</solr-version> + <splunk-version>1.2.0_1</splunk-version> <spring-batch-version>2.2.2.RELEASE</spring-batch-version> <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version> <spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version> http://git-wip-us.apache.org/repos/asf/camel/blob/d0f7ce27/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 1f83ff4..6feeb88 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -936,6 +936,12 @@ <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> <bundle>mvn:org.apache.camel/camel-solr/${project.version}</bundle> </feature> + <feature name='camel-splunk' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-core</feature> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.splunk/${splunk-version}</bundle> + <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> + <bundle>mvn:org.apache.camel/camel-splunk/${project.version}</bundle> + </feature> <feature name='camel-spring-batch' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:org.springframework.batch/spring-batch-core/${spring-batch-version}</bundle> <bundle dependency='true'>mvn:org.springframework.batch/spring-batch-infrastructure/${spring-batch-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/d0f7ce27/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java new file mode 100644 index 0000000..8de10fb --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java @@ -0,0 +1,40 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.itest.karaf; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.junit.Configuration; +import org.ops4j.pax.exam.junit.JUnit4TestRunner; + +@RunWith(JUnit4TestRunner.class) +public class CamelSplunkTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelSplunkTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file
