Repository: camel Updated Branches: refs/heads/master ccd30cd25 -> dc08a428d
CAMEL-11852: camel-milo : create karaf feature Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc08a428 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc08a428 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc08a428 Branch: refs/heads/master Commit: dc08a428ddbc38b79b9cb02a2e5ee5c4c93a0c1a Parents: ccd30cd Author: lburgazzoli <lburgazz...@gmail.com> Authored: Wed Sep 27 17:15:51 2017 +0200 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Wed Sep 27 17:15:51 2017 +0200 ---------------------------------------------------------------------- parent/pom.xml | 5 +++ .../features/src/main/resources/features.xml | 25 +++++++++++++++ .../apache/camel/itest/karaf/CamelMiloTest.java | 33 ++++++++++++++++++++ 3 files changed, 63 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dc08a428/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index a68ee43..9b5a29b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -224,6 +224,8 @@ <felix-scr-annotations-version>1.12.0</felix-scr-annotations-version> <felix-scr-version>2.0.12</felix-scr-version> <findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version> + <google-findbugs-jsr305-version>3.0.2</google-findbugs-jsr305-version> + <google-findbugs-annotations2-version>2.0.3</google-findbugs-annotations2-version> <flatpack-version>3.4.3</flatpack-version> <flink-version>1.3.2</flink-version> <fop-bundle-version>2.1_1</fop-bundle-version> @@ -393,6 +395,7 @@ <jolokia-version>1.3.7</jolokia-version> <jolt-version>0.1.0</jolt-version> <jolt-bundle-version>0.1.0_1</jolt-bundle-version> + <jool-version>0.9.12</jool-version> <johnzon-version>1.1.0</johnzon-version> <jose4j-version>0.4.4</jose4j-version> <josql-bundle-version>1.5_5</josql-bundle-version> @@ -558,6 +561,7 @@ <protobuf-version>3.3.0</protobuf-version> <protobuf-guava-version>20.0</protobuf-guava-version> <protobuf-maven-plugin-version>0.5.0</protobuf-maven-plugin-version> + <protonpack-version>1.8</protonpack-version> <pubnub-version>4.6.5</pubnub-version> <qpid-bundle-version>0.28_1</qpid-bundle-version> <qpid-proton-j-version>0.16.0</qpid-proton-j-version> @@ -571,6 +575,7 @@ <rabbitmq-amqp-client-version>4.2.1</rabbitmq-amqp-client-version> <reactive-streams-version>1.0.0</reactive-streams-version> <reactor-version>3.0.7.RELEASE</reactor-version> + <reflections-version>0.9.11</reflections-version> <reflections-bundle-version>0.9.10_3</reflections-bundle-version> <regexp-bundle-version>1.4_1</regexp-bundle-version> <rest-assured-version>3.0.3</rest-assured-version> http://git-wip-us.apache.org/repos/asf/camel/blob/dc08a428/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 fc168e3..b3f870a 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1411,6 +1411,31 @@ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle>mvn:org.apache.camel/camel-metrics/${project.version}</bundle> </feature> + + <feature name='camel-milo' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-core</feature> + <bundle dependency='true'>mvn:org.javassist/javassist/${javassist-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-bundle-version}</bundle> + <bundle dependency='true'>mvn:com.codepoetics/protonpack/${protonpack-version}</bundle> + <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle> + <bundle dependency='true'>mvn:org.jooq/jool/${jool-version}</bundle> + <bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle> + <bundle dependency='true'>mvn:com.google.code.findbugs/annotations/${google-findbugs-annotations2-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-common/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-handler/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-transport/${netty40-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec/${netty40-version}</bundle> + <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> + <bundle dependency='true'>mvn:org.eclipse.milo/stack-core/${milo-version}</bundle> + <bundle dependency='true'>mvn:org.eclipse.milo/stack-server/${milo-version}</bundle> + <bundle dependency='true'>mvn:org.eclipse.milo/stack-client/${milo-version}</bundle> + <bundle dependency='true'>mvn:org.eclipse.milo/sdk-core/${milo-version}</bundle> + <bundle dependency='true'>mvn:org.eclipse.milo/sdk-server/${milo-version}</bundle> + <bundle dependency='true'>mvn:org.eclipse.milo/sdk-client/${milo-version}</bundle> + <bundle>mvn:org.apache.camel/camel-milo/${project.version}</bundle> + </feature> + <feature name='camel-mina' 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.mina/${mina-bundle-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/dc08a428/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMiloTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMiloTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMiloTest.java new file mode 100644 index 0000000..0959c53 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMiloTest.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 CamelMiloTest extends BaseKarafTest { + @Test + public void testClient() throws Exception { + testComponent("milo", "milo-client"); + } + @Test + public void testServer() throws Exception { + testComponent("milo", "milo-server"); + } +}
