You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/11/08 11:28:23 UTC
camel git commit: CAMEL-9302: Add camel-jolt to features
Repository: camel
Updated Branches:
refs/heads/master 5a429ac67 -> 86e7014bc
CAMEL-9302: Add camel-jolt to features
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/86e7014b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/86e7014b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/86e7014b
Branch: refs/heads/master
Commit: 86e7014bc46cda6aba514d66e63d3a24e04ff71e
Parents: 5a429ac
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Nov 8 11:23:05 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Nov 8 11:23:05 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 +
.../features/src/main/resources/features.xml | 5 +++
.../apache/camel/itest/karaf/CamelJoltTest.java | 40 ++++++++++++++++++++
3 files changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/86e7014b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8d576ca..e5115c0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -293,6 +293,7 @@
<jodatime2-bundle-version>2.9</jodatime2-bundle-version>
<jolokia-version>1.3.2</jolokia-version>
<jolt-version>0.0.16</jolt-version>
+ <jolt-bundle-version>0.0.16_1</jolt-bundle-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
<josql-version>1.5</josql-version>
<jruby-version>1.7.18</jruby-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/86e7014b/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 eb1c55a..69c086e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -845,6 +845,11 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jmx/${project.version}</bundle>
</feature>
+ <feature name='camel-jolt' version='${project.version}' resolver='(obr)' start-level='50'>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bazaarvoice-jolt/${jolt-bundle-version}</bundle>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-jolt/${project.version}</bundle>
+ </feature>
<feature name='camel-josql' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
http://git-wip-us.apache.org/repos/asf/camel/blob/86e7014b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJoltTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJoltTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJoltTest.java
new file mode 100644
index 0000000..6c69b4c
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJoltTest.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 CamelJoltTest extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelJoltTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
\ No newline at end of file