Repository: camel Updated Branches: refs/heads/master 325b663c2 -> b01150d60
CAMEL-8650 camel-docker - Add to karaf features Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b01150d6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b01150d6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b01150d6 Branch: refs/heads/master Commit: b01150d60d020ff652415fcc5991256e925d48f0 Parents: 325b663 Author: Andrea Cosentino <anco...@gmail.com> Authored: Sun May 17 17:55:26 2015 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Sun May 17 17:55:26 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 6 +++ .../features/src/main/resources/features.xml | 28 ++++++++++++++ .../camel/itest/karaf/CamelDockerTest.java | 40 ++++++++++++++++++++ 3 files changed, 74 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b01150d6/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0301087..c6902b7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -132,6 +132,7 @@ <dnsjava-bundle-version>2.1.7_1</dnsjava-bundle-version> <docker-java-version>1.2.0</docker-java-version> <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version> + <docker-bundle-version>1.2.0_1</docker-bundle-version> <dozer-version>5.5.1</dozer-version> <drools-version>6.2.0.Final</drools-version> <dropbox-version>1.7.7</dropbox-version> @@ -210,6 +211,8 @@ <hibernate-validator-version>5.0.3.Final</hibernate-validator-version> <!-- Spring 3.2.x and 4.0.x still stick to JPA 2.0. Hibernate 4.3.x upgraded to JPA 2.1. --> <hibernate-version>4.2.16.Final</hibernate-version> + <hk2-version>2.3.0</hk2-version> + <hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version> <hsqldb-version>2.3.2</hsqldb-version> <htmlunit.version>2.15</htmlunit.version> <htmlunit-bundle-version>2.15_1</htmlunit-bundle-version> @@ -256,6 +259,7 @@ <jdom-bundle-version>1.1_4</jdom-bundle-version> <jdom-version>1.1.3</jdom-version> <jedis-client-bundle-version>2.7.1_1</jedis-client-bundle-version> + <jersey-version>2.11</jersey-version> <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version> <jetty6-version>6.1.26</jetty6-version> <jetty8-version>8.1.17.v20150415</jetty8-version> @@ -475,6 +479,8 @@ <twitter4j-bundle-version>4.0.3_1</twitter4j-bundle-version> <twitter4j-version>4.0.3</twitter4j-version> <univocity-parsers-version>1.2.1</univocity-parsers-version> + <unix-socket-factory-version>2015-01-27T15-02-14</unix-socket-factory-version> + <unix-socket-factory-bundle-version>1.0.0</unix-socket-factory-bundle-version> <urlrewritefilter-version>4.0.4</urlrewritefilter-version> <urlrewritefilter-bundle-version>4.0.4_1</urlrewritefilter-bundle-version> <validation-api-version>1.1.0.Final</validation-api-version> http://git-wip-us.apache.org/repos/asf/camel/blob/b01150d6/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 e630a8f..7f7d345 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -309,6 +309,34 @@ <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-disruptor/${project.version}</bundle> </feature> + <feature name='camel-docker' version='${project.version}' resolver='(obr)' start-level='50'> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.docker-java/${docker-bundle-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.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.google.guava/guava/${google-guava-version}</bundle> + <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> + <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle> + <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> + <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> + <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> + <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> + <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle> + <bundle dependency='true'>mvn:org.bouncycastle/bcmail-jdk15on/${bouncycastle-version}</bundle> + <bundle dependency='true'>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle-version}</bundle> + <bundle dependency='true'>mvn:org.glassfish.jersey.core/jersey-client/${jersey-version}</bundle> + <bundle dependency='true'>mvn:org.glassfish.jersey.core/jersey-common/${jersey-version}</bundle> + <bundle dependency='true'>mvn:org.glassfish.jersey.bundles.repackaged/jersey-guava/${jersey-version}</bundle> + <bundle dependency='true'>mvn:org.glassfish.hk2/hk2-api/${hk2-version}</bundle> + <bundle dependency='true'>mvn:org.glassfish.hk2/hk2-utils/${hk2-version}</bundle> + <bundle dependency='true'>mvn:org.glassfish.hk2/osgi-resource-locator/${hk2-osgi-resource-version}</bundle> + <bundle dependency="true">wrap:mvn:org.glassfish.jersey.connectors/jersey-apache-connector/${jersey-version}$Bundle-SymbolicName=org.glassfish.jersey.connectors&Bundle-Version=${jersey-version}</bundle> + <bundle dependency='true'>wrap:mvn:de.gesellix/unix-socket-factory/${unix-socket-factory-version}$Bundle-SymbolicName=de.gesellix.unix-socket-factory&Bundle-Version=${unix-socket-factory-bundle-version}</bundle> + <feature version='${project.version}'>camel-core</feature> + <bundle>mvn:org.apache.camel/camel-docker/${project.version}</bundle> + </feature> <feature name='camel-dns' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dnsjava/${dnsjava-bundle-version}</bundle> <feature version='${project.version}'>camel-core</feature> http://git-wip-us.apache.org/repos/asf/camel/blob/b01150d6/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java new file mode 100644 index 0000000..31d1fd3 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.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 CamelDockerTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelDockerTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file
