Remove camel-docker as jersey do not work in osgi and its one pain in the ass to get working
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7db9c8e5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7db9c8e5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7db9c8e5 Branch: refs/heads/master Commit: 7db9c8e5e8f5822e8e36c0dc947b7e8dec242b7b Parents: 8240465 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Mar 12 15:26:16 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Mar 12 15:27:36 2016 +0100 ---------------------------------------------------------------------- .../features/src/main/resources/features.xml | 28 -------------------- .../camel/itest/karaf/CamelDockerTest.java | 2 ++ 2 files changed, 2 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7db9c8e5/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 c974bb2..b11cfff 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -345,34 +345,6 @@ <bundle dependency='true'>mvn:com.lmax/disruptor/${disruptor-version}</bundle> <bundle>mvn:org.apache.camel/camel-disruptor/${project.version}</bundle> </feature> - <feature name='camel-docker' 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.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/${docker-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> - <bundle>mvn:org.apache.camel/camel-docker/${project.version}</bundle> - </feature> <feature name='camel-dns' 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.dnsjava/${dnsjava-bundle-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/7db9c8e5/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 index 31d1fd3..5e269d4 100644 --- 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 @@ -16,6 +16,7 @@ */ package org.apache.camel.itest.karaf; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -23,6 +24,7 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) +@Ignore("camel-docker do not work in OSGi") public class CamelDockerTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelDockerTest.class);
