Repository: camel Updated Branches: refs/heads/master 27c02551b -> 608236dd6
CAMEL-11856: Started working on a camel-olign4 karaf feature Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/608236dd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/608236dd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/608236dd Branch: refs/heads/master Commit: 608236dd6a56633f1309312e0ea7b86186240405 Parents: 27c0255 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Sep 28 10:56:35 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Sep 28 10:56:47 2017 +0200 ---------------------------------------------------------------------- .../features/src/main/resources/features.xml | 30 ++++++++++++++++- .../camel/itest/karaf/CamelOlingo4Test.java | 35 ++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/608236dd/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 53f34a0..37c1b5a 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1554,7 +1554,6 @@ </feature> <feature name='camel-olingo2' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <feature version='${project.version}'>camel-core</feature> <feature>http</feature> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> @@ -1568,6 +1567,35 @@ <bundle dependency='true'>mvn:org.apache.camel/camel-olingo2-api/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-olingo2/${project.version}</bundle> </feature> + <!-- TODO: https://issues.apache.org/jira/browse/CAMEL-11856 + <feature name='camel-olingo4' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-core</feature> + <feature>http</feature> + <bundle dependency='true'>mvn:org.apache.olingo/odata-commons-api/${olingo4-version}</bundle> + <bundle dependency='true'>mvn:org.apache.olingo/odata-commons-core/${olingo4-version}</bundle> + <bundle dependency='true'>mvn:org.apache.olingo/odata-server-api/${olingo4-version}</bundle> + <bundle dependency='true'>mvn:org.apache.olingo/odata-server-core/${olingo4-version}</bundle> + <bundle dependency='true'>mvn:org.apache.olingo/odata-client-api/${olingo4-version}</bundle> + <bundle dependency='true'>mvn:org.apache.olingo/odata-client-core/${olingo4-version}</bundle> + <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> + <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> + <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-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.apache.httpcomponents/httpasyncclient-osgi/${httpasyncclient-version}</bundle> + <bundle dependency='true'>wrap:mvn:net.sf.jsignature.io-tools/easystream/1.2.15</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-xml/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml/aalto-xml/0.9.10</bundle> + <bundle dependency='true'>mvn:org.apache.camel/camel-olingo4-api/${project.version}</bundle> + <bundle>mvn:org.apache.camel/camel-olingo4/${project.version}</bundle> + </feature> --> <feature name='camel-openshift' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>wrap:mvn:com.openshift/openshift-java-client/${openshift-java-client-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/608236dd/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo4Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo4Test.java new file mode 100644 index 0000000..7937a74 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo4Test.java @@ -0,0 +1,35 @@ +/** + * 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.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.junit.PaxExam; + +@Ignore("https://issues.apache.org/jira/browse/CAMEL-11856";) +@RunWith(PaxExam.class) +public class CamelOlingo4Test extends BaseKarafTest { + + public static final String COMPONENT = extractName(CamelOlingo4Test.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + +}
