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 2019/05/29 10:29:44 UTC
[camel] branch master updated (03c2ca7 -> e28bb17)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 03c2ca7 CAMEL-10324 - Regen
new b90aa96 CAMEL-13595 - Camel-CBOR: Add a Karaf feature
new e28bb17 CAMEL-13596 - Camel-CBOR: Add Spring Boot and Karaf Integration test
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
platforms/karaf/features/src/main/resources/features.xml | 8 ++++++++
.../camel/itest/karaf/{CamelBoonTest.java => CamelCborTest.java} | 4 ++--
.../itest/springboot/{CamelBoonTest.java => CamelCborTest.java} | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
copy tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/{CamelBoonTest.java => CamelCborTest.java} (90%)
copy tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelBoonTest.java => CamelCborTest.java} (92%)
[camel] 01/02: CAMEL-13595 - Camel-CBOR: Add a Karaf feature
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b90aa96c046f9742b3cd4695dbfe282462c7a32f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed May 29 12:24:38 2019 +0200
CAMEL-13595 - Camel-CBOR: Add a Karaf feature
---
.../karaf/features/src/main/resources/features.xml | 8 ++++++
.../apache/camel/itest/karaf/CamelCborTest.java | 33 ++++++++++++++++++++++
2 files changed, 41 insertions(+)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 3e2ffe9..f2c0e08 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -633,6 +633,14 @@
<bundle dependency='true'>mvn:com.datastax.cassandra/cassandra-driver-core/${cassandra-driver-version}</bundle>
<bundle>mvn:org.apache.camel/camel-cassandraql/${project.version}</bundle>
</feature>
+ <feature name='camel-cbor' version='${project.version}' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <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-cbor/${jackson2-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-cbor/${project.version}</bundle>
+ </feature>
<feature name='camel-cdi' version='${project.version}' start-level='50'>
<details>camel-cdi in OSGi is deprecated. Use blueprint instead. camel-cdi requires that either pax-cdi-weld or pax-cdi-openwebbeans has been installed</details>
<feature version='${project.version}'>camel-core</feature>
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCborTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCborTest.java
new file mode 100644
index 0000000..71335aa
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCborTest.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 CamelCborTest extends BaseKarafTest {
+
+ public static final String COMPONENT = extractName(CamelCborTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testDataFormat(COMPONENT);
+ }
+
+}
[camel] 02/02: CAMEL-13596 - Camel-CBOR: Add Spring Boot and Karaf
Integration test
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e28bb1706fb1b78406d3773941b2a978939cc97c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed May 29 12:29:03 2019 +0200
CAMEL-13596 - Camel-CBOR: Add Spring Boot and Karaf Integration test
---
.../camel/itest/springboot/CamelCborTest.java | 48 ++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCborTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCborTest.java
new file mode 100644
index 0000000..95bee7b
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCborTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+public class CamelCborTest extends AbstractSpringBootTestSupport {
+
+ @Deployment
+ public static Archive<?> createSpringBootPackage() throws Exception {
+ return ArquillianPackager.springBootPackage(createTestConfig());
+ }
+
+ public static ITestConfig createTestConfig() {
+ return new ITestConfigBuilder()
+ .module(inferModuleName(CamelCborTest.class))
+ .build();
+ }
+
+ @Test
+ public void componentTests() throws Exception {
+ this.runDataformatTest(config);
+ this.runModuleUnitTestsIfEnabled(config);
+ }
+
+
+}