You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/03/02 08:51:30 UTC
camel git commit: CAMEL-10921: Add Elasticsearch5 Karaf Feature
Repository: camel
Updated Branches:
refs/heads/master 121f729b7 -> 56305c24f
CAMEL-10921: Add Elasticsearch5 Karaf Feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/56305c24
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/56305c24
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/56305c24
Branch: refs/heads/master
Commit: 56305c24fcf0f6b6066621cf1b8e7d0329364098
Parents: 121f729
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Mar 2 09:49:59 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Mar 2 09:49:59 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 +
.../features/src/main/resources/features.xml | 15 +++++++++
.../itest/karaf/CamelElasticsearch5Test.java | 33 ++++++++++++++++++++
3 files changed, 49 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/56305c24/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2a7daff..814b674 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -176,6 +176,7 @@
<elasticsearch-guava-version>18.0</elasticsearch-guava-version>
<elasticsearch-version>2.4.3</elasticsearch-version>
<elasticsearch5-version>5.1.2</elasticsearch5-version>
+ <elasticsearch5-bundle-version>5.1.2_1</elasticsearch5-bundle-version>
<elasticsearch-cluster-runner-version>2.4.0.0</elasticsearch-cluster-runner-version>
<elasticsearch5-cluster-runner-version>5.1.2.0</elasticsearch5-cluster-runner-version>
<elsql-version>1.2</elsql-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/56305c24/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 2b2659a..e124064 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -501,6 +501,21 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-elasticsearch/${project.version}</bundle>
</feature>
+ <feature name='camel-elasticsearch5' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <feature>http</feature>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${elasticsearch-guava-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.ning/compress-lzf/${compress-lzf-version}</bundle>
+ <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch5-bundle-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.elasticsearch.client/transport/${elasticsearch5-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-elasticsearch5/${project.version}</bundle>
+ </feature>
<feature name='camel-etcd' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/56305c24/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearch5Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearch5Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearch5Test.java
new file mode 100644
index 0000000..877f29c
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearch5Test.java
@@ -0,0 +1,33 @@
+/**
+ * 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.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelElasticsearch5Test extends BaseKarafTest {
+
+ public static final String COMPONENT = extractName(CamelElasticsearch5Test.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+}