Repository: camel Updated Branches: refs/heads/master 6efaad4cd -> 0469d2a76
CAMEL-11851: camel-kura feature Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff8c5cd7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff8c5cd7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff8c5cd7 Branch: refs/heads/master Commit: ff8c5cd7baa9ba6e8085c55ea5f13233608171bc Parents: 6efaad4 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Sep 27 15:20:57 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Sep 27 15:20:57 2017 +0200 ---------------------------------------------------------------------- components/camel-kura/pom.xml | 6 ++-- parent/pom.xml | 2 ++ .../features/src/main/resources/features.xml | 6 ++++ .../apache/camel/itest/karaf/CamelKuraTest.java | 33 ++++++++++++++++++++ .../apache/camel/itest/karaf/CamelScrTest.java | 33 ++++++++++++++++++++ 5 files changed, 76 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ff8c5cd7/components/camel-kura/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml index 2ebb709..746448a 100644 --- a/components/camel-kura/pom.xml +++ b/components/camel-kura/pom.xml @@ -40,8 +40,6 @@ <camel.osgi.export.pkg>org.apache.camel.component.kura</camel.osgi.export.pkg> <kura-slf4j.version>1.6.4</kura-slf4j.version> - <eclipse-osgi.version>3.8.1.v20120830-144521</eclipse-osgi.version> - <eclipse-osgi-services.version>3.3.100.v20120522-1822</eclipse-osgi-services.version> </properties> <dependencies> @@ -52,12 +50,12 @@ <dependency> <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.osgi</artifactId> - <version>${eclipse-osgi.version}</version> + <version>${eclipse-birt-version}</version> </dependency> <dependency> <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.osgi.services</artifactId> - <version>${eclipse-osgi-services.version}</version> + <version>${eclipse-birt-services-version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/ff8c5cd7/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 9aa8ef0..22c1e3f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -192,6 +192,8 @@ <dropbox-version>1.8.2</dropbox-version> <easymock-version>3.4</easymock-version> <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version> + <eclipse-birt-version>3.8.1.v20120830-144521</eclipse-birt-version> + <eclipse-birt-services-version>3.3.100.v20120522-1822</eclipse-birt-services-version> <egit-github-core-version>2.1.5</egit-github-core-version> <egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version> <ehcache-version>2.10.1</ehcache-version> http://git-wip-us.apache.org/repos/asf/camel/blob/ff8c5cd7/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 ed50226..fc168e3 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1290,6 +1290,12 @@ <bundle dependency='true'>mvn:io.fabric8/openshift-client/${kubernetes-client-version}/jar/bundle</bundle> <bundle>mvn:org.apache.camel/camel-kubernetes/${project.version}</bundle> </feature> + <feature name='camel-kura' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-core</feature> + <feature>scr</feature> + <bundle dependency='true'>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle> + <bundle>mvn:org.apache.camel/camel-kura/${project.version}</bundle> + </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/ff8c5cd7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKuraTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKuraTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKuraTest.java new file mode 100644 index 0000000..ee67fc6 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKuraTest.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 CamelKuraTest extends BaseKarafTest { + + public static final String COMPONENT = extractName(CamelKuraTest.class); + + @Test + public void test() throws Exception { + installCamelFeature(COMPONENT); + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/ff8c5cd7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScrTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScrTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScrTest.java new file mode 100644 index 0000000..581cb59 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScrTest.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 CamelScrTest extends BaseKarafTest { + + public static final String COMPONENT = extractName(CamelScrTest.class); + + @Test + public void test() throws Exception { + installCamelFeature(COMPONENT); + } + +}
