Repository: camel Updated Branches: refs/heads/master be3cc2f93 -> 9ab89ccf2
CAMEL-9085 Create a Camel-Kubernetes/Openshift v3 Component. Add Camel-Kubernetes Feature Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e4f23180 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e4f23180 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e4f23180 Branch: refs/heads/master Commit: e4f231804034964bcfaece288e4c11b7a71967a2 Parents: 03d6484 Author: Andrea Cosentino <anco...@gmail.com> Authored: Sat Oct 17 14:10:57 2015 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Sun Oct 18 09:33:00 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 3 ++ .../features/src/main/resources/features.xml | 20 ++++++++++ .../camel/itest/karaf/CamelKubernetesTest.java | 40 ++++++++++++++++++++ 3 files changed, 63 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e4f23180/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d317b6d..f382a92 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -252,6 +252,7 @@ <javax.el-version>2.2.5</javax.el-version> <javax-inject-bundle-version>1_2</javax-inject-bundle-version> <javax-mail-version>1.4.7</javax-mail-version> + <javax.servlet-api-version>3.1.0</javax.servlet-api-version> <jaxb-bundle-version>2.2.6_1</jaxb-bundle-version> <jaxen-version>1.1.6</jaxen-version> <jbpm-version>6.3.0.Final</jbpm-version> @@ -325,6 +326,7 @@ <kie-version>6.3.0.Final</kie-version> <krati-version>0.4.9</krati-version> <kubernetes-client-version>1.3.52</kubernetes-client-version> + <kubernetes-model-version>1.0.29</kubernetes-model-version> <kxml2-bundle-version>2.3.0_2</kxml2-bundle-version> <leveldbjni-version>1.8</leveldbjni-version> <!-- virtual dependency only used by Eclipse m2e --> @@ -384,6 +386,7 @@ <noggit-bundle-version>0.5_1</noggit-bundle-version> <!-- should be in-sync with deltaspike --> <openwebbeans-version>1.2.0</openwebbeans-version> + <oauth-provider-bundle-version>20100527_1</oauth-provider-bundle-version> <olingo2-version>2.0.4</olingo2-version> <olingo-odata2-core-bundle-version>2.0.4_1</olingo-odata2-core-bundle-version> <ognl-version>3.0.11</ognl-version> http://git-wip-us.apache.org/repos/asf/camel/blob/e4f23180/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 a0a12f5..0906e13 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -992,6 +992,26 @@ <bundle>mvn:org.apache.camel/camel-krati/${project.version}</bundle> <feature version='${project.version}'>camel-core</feature> </feature> + <feature name='camel-kubernetes' version='${project.version}' resolver='(obr)' start-level='50'> + <bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle> + <bundle dependency='true'>mvn:com.ning/async-http-client/${ahc-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oauth-provider/${oauth-provider-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle> + <bundle dependency='true'>mvn:io.fabric8/kubernetes-model/${kubernetes-model-version}</bundle> + <bundle dependency='true'>mvn:io.fabric8/kubernetes-client/${kubernetes-client-version}</bundle> + <bundle dependency='true'>mvn:io.fabric8/openshift-client/${openshift-client-version}</bundle> + <bundle>mvn:org.apache.camel/camel-kubernetes/${project.version}</bundle> + <feature version='${project.version}'>camel-core</feature> + </feature> <feature name='camel-ldap' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-ldap/${project.version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/e4f23180/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKubernetesTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKubernetesTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKubernetesTest.java new file mode 100644 index 0000000..eda3cf2 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKubernetesTest.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.Configuration; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.junit.PaxExam; + +@RunWith(PaxExam.class) +public class CamelKubernetesTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelKubernetesTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file
