You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/07/31 10:52:27 UTC
[1/4] camel git commit: add spring-boot test
Repository: camel
Updated Branches:
refs/heads/master 7563d84df -> 8e9a7b7ba
add spring-boot test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4af3604e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4af3604e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4af3604e
Branch: refs/heads/master
Commit: 4af3604e436cc3d0674f6ffda81d554922b3791f
Parents: 7563d84
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 31 12:43:53 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 31 12:43:53 2017 +0200
----------------------------------------------------------------------
.../springboot/CamelZookeeperMasterTest.java | 48 ++++++++++++++++++++
1 file changed, 48 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4af3604e/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZookeeperMasterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZookeeperMasterTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZookeeperMasterTest.java
new file mode 100644
index 0000000..e3c38c3
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZookeeperMasterTest.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 CamelZookeeperMasterTest extends AbstractSpringBootTestSupport {
+
+ @Deployment
+ public static Archive<?> createSpringBootPackage() throws Exception {
+ return ArquillianPackager.springBootPackage(createTestConfig());
+ }
+
+ public static ITestConfig createTestConfig() {
+ return new ITestConfigBuilder()
+ .module(inferModuleName(CamelZookeeperMasterTest.class))
+ .build();
+ }
+
+ @Test
+ public void componentTests() throws Exception {
+ this.runComponentTest(config);
+ this.runModuleUnitTestsIfEnabled(config);
+ }
+
+
+}
[3/4] camel git commit: Fix spring-boot itest to ignore another
spring-security JAR
Posted by da...@apache.org.
Fix spring-boot itest to ignore another spring-security JAR
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/617d2ba4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/617d2ba4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/617d2ba4
Branch: refs/heads/master
Commit: 617d2ba44ee5c2f4e1ea68f738728d28da876b37
Parents: 74f7e7b
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 31 12:50:26 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 31 12:50:26 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/itest/springboot/util/ArquillianPackager.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/617d2ba4/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
index f153247..1d80eb3 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
@@ -324,6 +324,7 @@ public final class ArquillianPackager {
ignore.add("net.sourceforge.htmlunit:htmlunit-core-js"); // v 2.21 does not exist
ignore.add("org.springframework.data");
ignore.add("org.springframework.security:spring-security-jwt");
+ ignore.add("org.springframework.security:spring-security-rsa");
ignore.add("org.springframework.social");
ignore.add("org.webjars"); // No problem
ignore.add("stax:stax-api");
[4/4] camel git commit: Added spring-boot tests
Posted by da...@apache.org.
Added spring-boot tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8e9a7b7b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8e9a7b7b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8e9a7b7b
Branch: refs/heads/master
Commit: 8e9a7b7ba611737e25a5751669522599f69b1e43
Parents: 617d2ba
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 31 12:51:33 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 31 12:52:16 2017 +0200
----------------------------------------------------------------------
.../springboot/CamelSpringCloudNetflixTest.java | 48 ++++++++++++++++++++
.../itest/springboot/CamelSpringCloudTest.java | 48 ++++++++++++++++++++
.../itest/springboot/CamelZendeskTest.java | 47 +++++++++++++++++++
3 files changed, 143 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8e9a7b7b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudNetflixTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudNetflixTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudNetflixTest.java
new file mode 100644
index 0000000..c194a07
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudNetflixTest.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 CamelSpringCloudNetflixTest extends AbstractSpringBootTestSupport {
+
+ @Deployment
+ public static Archive<?> createSpringBootPackage() throws Exception {
+ return ArquillianPackager.springBootPackage(createTestConfig());
+ }
+
+ public static ITestConfig createTestConfig() {
+ return new ITestConfigBuilder()
+ .module(inferModuleName(CamelSpringCloudNetflixTest.class))
+ .build();
+ }
+
+ @Test
+ public void componentTests() throws Exception {
+ // no component test
+ this.runModuleUnitTestsIfEnabled(config);
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8e9a7b7b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudTest.java
new file mode 100644
index 0000000..a8a48ab
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudTest.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 CamelSpringCloudTest extends AbstractSpringBootTestSupport {
+
+ @Deployment
+ public static Archive<?> createSpringBootPackage() throws Exception {
+ return ArquillianPackager.springBootPackage(createTestConfig());
+ }
+
+ public static ITestConfig createTestConfig() {
+ return new ITestConfigBuilder()
+ .module(inferModuleName(CamelSpringCloudTest.class))
+ .build();
+ }
+
+ @Test
+ public void componentTests() throws Exception {
+ // no component test
+ this.runModuleUnitTestsIfEnabled(config);
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8e9a7b7b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZendeskTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZendeskTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZendeskTest.java
new file mode 100644
index 0000000..8df5334
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZendeskTest.java
@@ -0,0 +1,47 @@
+/**
+ * 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 CamelZendeskTest extends AbstractSpringBootTestSupport {
+
+ @Deployment
+ public static Archive<?> createSpringBootPackage() throws Exception {
+ return ArquillianPackager.springBootPackage(createTestConfig());
+ }
+
+ public static ITestConfig createTestConfig() {
+ return new ITestConfigBuilder()
+ .module(inferModuleName(CamelZendeskTest.class))
+ .build();
+ }
+
+ @Test
+ public void componentTests() throws Exception {
+ this.runComponentTest(config);
+ this.runModuleUnitTestsIfEnabled(config);
+ }
+
+}
[2/4] camel git commit: align spring-cloud versions
Posted by da...@apache.org.
align spring-cloud versions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74f7e7b0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74f7e7b0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74f7e7b0
Branch: refs/heads/master
Commit: 74f7e7b00a14b6aa4063bd39d623ef3849c51d6d
Parents: 4af3604
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 31 12:44:56 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 31 12:44:56 2017 +0200
----------------------------------------------------------------------
components/camel-spring-cloud-netflix/pom.xml | 5 +++++
components/camel-spring-cloud/pom.xml | 5 +++++
parent/pom.xml | 3 ++-
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/74f7e7b0/components/camel-spring-cloud-netflix/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-cloud-netflix/pom.xml b/components/camel-spring-cloud-netflix/pom.xml
index e5327a5..cc10d14 100644
--- a/components/camel-spring-cloud-netflix/pom.xml
+++ b/components/camel-spring-cloud-netflix/pom.xml
@@ -47,6 +47,11 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ <version>${spring-cloud-commons-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-core</artifactId>
<version>${spring-cloud-netflix-version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/74f7e7b0/components/camel-spring-cloud/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-cloud/pom.xml b/components/camel-spring-cloud/pom.xml
index 7b39607..d9faf51 100644
--- a/components/camel-spring-cloud/pom.xml
+++ b/components/camel-spring-cloud/pom.xml
@@ -47,6 +47,11 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ <version>${spring-cloud-commons-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-commons</artifactId>
<version>${spring-cloud-commons-version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/74f7e7b0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6d7ab4d..a1f198f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -611,8 +611,9 @@
<spring-batch-version>3.0.8.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.7.RELEASE_1</spring-batch-bundle-version>
<spring-boot-version>1.5.6.RELEASE</spring-boot-version>
+ <!-- use same version of spring-cloud 1.x. -->
<spring-cloud-commons-version>1.2.3.RELEASE</spring-cloud-commons-version>
- <spring-cloud-netflix-version>1.3.2.RELEASE</spring-cloud-netflix-version>
+ <spring-cloud-netflix-version>1.2.7.RELEASE</spring-cloud-netflix-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>1.11.6.RELEASE</spring-data-commons-version>
<spring-data-redis-version>1.8.6.RELEASE</spring-data-redis-version>