camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject camel git commit: Regen and CAMEL-11389 add karaf feature for camel-fastjson
Date Fri, 09 Jun 2017 09:40:23 GMT
Repository: camel
Updated Branches:
  refs/heads/master 32a83ca81 -> cce160b48


Regen and CAMEL-11389 add karaf feature for camel-fastjson


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cce160b4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cce160b4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cce160b4

Branch: refs/heads/master
Commit: cce160b48e8a34090e39f1546746b9b58a703e93
Parents: 32a83ca
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Fri Jun 9 11:03:18 2017 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Fri Jun 9 11:39:42 2017 +0200

----------------------------------------------------------------------
 .../features/src/main/resources/features.xml    |  5 +++
 .../camel-spring-boot-bom/pom.xml               |  5 +++
 .../camel-spring-boot-dependencies/pom.xml      |  5 +++
 .../camel/itest/karaf/CamelFastjsonTest.java    | 33 ++++++++++++++++++++
 4 files changed, 48 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cce160b4/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 cc8d144..d7c7064 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -604,6 +604,11 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.facebook4j/${facebook4j-core-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-facebook/${project.version}</bundle>
   </feature>
+  <feature name='camel-fastjson' version='${project.version}' resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle dependency='true'>wrap:mvn:com.alibaba/fastjson/${fastjson-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-fastjson/${project.version}</bundle>
+  </feature>
   <feature name='camel-flatpack' 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.jdom/${jdom-bundle-version}</bundle>

http://git-wip-us.apache.org/repos/asf/camel/blob/cce160b4/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml
index fc23247..92d0f68 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml
@@ -357,6 +357,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-fastjson-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-flatpack-starter</artifactId>
         <version>${project.version}</version>
       </dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/cce160b4/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index c293e6e..323eb4c 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -881,6 +881,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-fastjson-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-flatpack</artifactId>
         <version>${project.version}</version>
       </dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/cce160b4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFastjsonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFastjsonTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFastjsonTest.java
new file mode 100644
index 0000000..03a7dfc
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFastjsonTest.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 CamelFastjsonTest extends BaseKarafTest {
+
+    public static final String COMPONENT = extractName(CamelFastjsonTest.class);
+
+    @Test
+    public void test() throws Exception {
+        testDataFormat(COMPONENT, "json-fastjson");
+    }
+
+}


Mime
View raw message