[camel] branch master updated: "CAMEL-13454:camel-testcontainers - Should build if no docker reverted back to mvn profile implementation"

2019-07-25 Thread ramu12 
This is an automated email from the ASF dual-hosted git repository.

ramu12 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new e2fb236  "CAMEL-13454:camel-testcontainers - Should build if no docker 
reverted back to mvn profile implementation"
e2fb236 is described below

commit e2fb236a3a2b4d026e27c0e65e1f6d1898c6cbee
Author: Kodanda Ramu Kakarla 
AuthorDate: Thu Jul 25 21:43:57 2019 +0530

"CAMEL-13454:camel-testcontainers - Should build if no docker reverted back 
to mvn profile implementation"
---
 components/camel-pulsar/pom.xml| 65 +
 components/camel-testcontainers-spring/pom.xml | 83 ++
 .../spring/ContainerAwareSpringTestSupport.java|  3 -
 components/camel-testcontainers/pom.xml| 81 +
 .../testcontainers/ContainerAwareTestSupport.java  |  3 -
 5 files changed, 229 insertions(+), 6 deletions(-)

diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml
index 41ace30..2e0820f 100644
--- a/components/camel-pulsar/pom.xml
+++ b/components/camel-pulsar/pom.xml
@@ -89,4 +89,69 @@
 test
 
 
+
+
+
+pulsar-skip-tests
+
+true
+
+
+
+
+maven-surefire-plugin
+
+true
+
+
+
+
+
+
+
+
+pulsar-tests-docker-file
+
+
+/var/run/docker.sock
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+
+
+
+
+
+
+
+
+pulsar-tests-docker-env
+
+
+env.DOCKER_HOST
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+
+
+
+
+
+
 
diff --git a/components/camel-testcontainers-spring/pom.xml 
b/components/camel-testcontainers-spring/pom.xml
index c2f66c1..d9b7072 100644
--- a/components/camel-testcontainers-spring/pom.xml
+++ b/components/camel-testcontainers-spring/pom.xml
@@ -72,4 +72,87 @@
 
 
 
+
+
+
+testcontainers-spring-skip-tests
+
+true
+
+
+
+
+maven-surefire-plugin
+
+true
+
+
+
+
+
+
+
+testcontainers-spring-integration-tests-docker-file
+
+
+/var/run/docker.sock
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+${skipTests}
+
+
true
+
+
+
+
+
+integration-test
+verify
+
+
+
+
+
+
+
+
+
+
+testcontainers-spring-integration-tests-docker-env
+
+
+env.DOCKER_HOST
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+${skipTests}
+
+
true
+
+
+
+
+
+integration-test
+verify
+
+
+

[camel] branch master updated: "CAMEL-13454:camel-testcontainers - Should build if no docker forpulsar component"

2019-07-21 Thread ramu12 
This is an automated email from the ASF dual-hosted git repository.

ramu12 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new e49145b  "CAMEL-13454:camel-testcontainers - Should build if no docker 
forpulsar component"
e49145b is described below

commit e49145b4a872ee799ebaa1e8241168c20e1ea594
Author: Kodanda Ramu Kakarla 
AuthorDate: Sun Jul 21 11:29:43 2019 +0530

"CAMEL-13454:camel-testcontainers - Should build if no docker forpulsar 
component"
---
 components/camel-pulsar/pom.xml | 65 -
 1 file changed, 65 deletions(-)

diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml
index 2e0820f..41ace30 100644
--- a/components/camel-pulsar/pom.xml
+++ b/components/camel-pulsar/pom.xml
@@ -89,69 +89,4 @@
 test
 
 
-
-
-
-pulsar-skip-tests
-
-true
-
-
-
-
-maven-surefire-plugin
-
-true
-
-
-
-
-
-
-
-
-pulsar-tests-docker-file
-
-
-/var/run/docker.sock
-
-
-
-
-
-maven-surefire-plugin
-
-${skipTests}
-
-
true
-
-
-
-
-
-
-
-
-
-pulsar-tests-docker-env
-
-
-env.DOCKER_HOST
-
-
-
-
-
-maven-surefire-plugin
-
-${skipTests}
-
-
true
-
-
-
-
-
-
-

[camel] branch master updated: "CAMEL-13454:camel-testcontainers - Should build if no docker"

2019-07-19 Thread ramu12 
This is an automated email from the ASF dual-hosted git repository.

ramu12 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new a4ac6b4  "CAMEL-13454:camel-testcontainers - Should build if no docker"
a4ac6b4 is described below

commit a4ac6b4ecd3251696aae3fd8539f1d48ad75a7ac
Author: Kodanda Ramu Kakarla 
AuthorDate: Fri Jul 19 18:53:34 2019 +0530

"CAMEL-13454:camel-testcontainers - Should build if no docker"
---
 components/camel-testcontainers-spring/pom.xml | 83 --
 .../spring/ContainerAwareSpringTestSupport.java|  3 +
 2 files changed, 3 insertions(+), 83 deletions(-)

diff --git a/components/camel-testcontainers-spring/pom.xml 
b/components/camel-testcontainers-spring/pom.xml
index d9b7072..c2f66c1 100644
--- a/components/camel-testcontainers-spring/pom.xml
+++ b/components/camel-testcontainers-spring/pom.xml
@@ -72,87 +72,4 @@
 
 
 
-
-
-
-testcontainers-spring-skip-tests
-
-true
-
-
-
-
-maven-surefire-plugin
-
-true
-
-
-
-
-
-
-
-testcontainers-spring-integration-tests-docker-file
-
-
-/var/run/docker.sock
-
-
-
-
-
-org.apache.maven.plugins
-maven-failsafe-plugin
-
-${skipTests}
-
-
true
-
-
-
-
-
-integration-test
-verify
-
-
-
-
-
-
-
-
-
-
-testcontainers-spring-integration-tests-docker-env
-
-
-env.DOCKER_HOST
-
-
-
-
-
-org.apache.maven.plugins
-maven-failsafe-plugin
-
-${skipTests}
-
-
true
-
-
-
-
-
-integration-test
-verify
-
-
-
-
-
-
-
-
-
 
diff --git 
a/components/camel-testcontainers-spring/src/main/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupport.java
 
b/components/camel-testcontainers-spring/src/main/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupport.java
index 8522801..71cc760 100644
--- 
a/components/camel-testcontainers-spring/src/main/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupport.java
+++ 
b/components/camel-testcontainers-spring/src/main/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupport.java
@@ -26,8 +26,10 @@ import 
org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
 import org.apache.camel.test.testcontainers.ContainerPropertiesFunction;
 import org.apache.camel.test.testcontainers.Containers;
+import org.junit.Assume;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
+import org.testcontainers.utility.DockerMachineClient;
 
 public abstract class ContainerAwareSpringTestSupport extends 
CamelSpringTestSupport {
 private List> containers = new 
CopyOnWriteArrayList<>();
@@ -38,6 +40,7 @@ public abstract class ContainerAwareSpringTestSupport extends 
CamelSpringTestSup
 
 @Override
 protected void setupResources() throws Exception {
+Assume.assumeTrue("Skipping test because docker not installed", 
DockerMachineClient.instance().isInstalled());
 super.setupResources();
 
 containers.clear();

[camel] branch master updated: "CAMEL-13454:camel-testcontainers - Should build if no docker"

2019-07-19 Thread ramu12 
This is an automated email from the ASF dual-hosted git repository.

ramu12 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 1a1bf67  "CAMEL-13454:camel-testcontainers - Should build if no docker"
1a1bf67 is described below

commit 1a1bf6706b3305b46e468ab24ecbbde93ea54474
Author: Kodanda Ramu Kakarla 
AuthorDate: Fri Jul 19 16:32:02 2019 +0530

"CAMEL-13454:camel-testcontainers - Should build if no docker"
---
 components/camel-testcontainers/pom.xml| 81 --
 .../testcontainers/ContainerAwareTestSupport.java  |  3 +
 2 files changed, 3 insertions(+), 81 deletions(-)

diff --git a/components/camel-testcontainers/pom.xml 
b/components/camel-testcontainers/pom.xml
index c882cf5..0c1d933 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -75,85 +75,4 @@
 
 
 
-
-  
-testcontainers-skip-tests
-
-true
-
-
-
-
-maven-surefire-plugin
-
-true
-
-
-
-
-
-
-
-testcontainers-integration-tests-docker-file
-
-
-/var/run/docker.sock
-
-
-
-
-
-org.apache.maven.plugins
-maven-failsafe-plugin
-
-${skipTests}
-
-
true
-
-
-
-
-
-integration-test
-verify
-
-
-
-
-
-
-
-
-
-
-testcontainers-integration-tests-docker-env
-
-
-env.DOCKER_HOST
-
-
-
-
-
-org.apache.maven.plugins
-maven-failsafe-plugin
-
-${skipTests}
-
-
true
-
-
-
-
-
-integration-test
-verify
-
-
-
-
-
-
-
-
 
diff --git 
a/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupport.java
 
b/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupport.java
index a2199f1..9f697ef 100644
--- 
a/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupport.java
+++ 
b/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupport.java
@@ -24,8 +24,10 @@ import java.util.concurrent.TimeUnit;
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assume;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
+import org.testcontainers.utility.DockerMachineClient;
 
 public class ContainerAwareTestSupport extends CamelTestSupport {
 private List> containers = new 
CopyOnWriteArrayList<>();
@@ -36,6 +38,7 @@ public class ContainerAwareTestSupport extends 
CamelTestSupport {
 
 @Override
 protected void setupResources() throws Exception {
+Assume.assumeTrue("Skipping test because docker not installed", 
DockerMachineClient.instance().isInstalled());
 super.setupResources();
 
 containers.clear();

[camel] branch master updated: "CAMEL-13454:camel-testcontainers - Should build if no docker"

2019-07-08 Thread ramu12 
This is an automated email from the ASF dual-hosted git repository.

ramu12 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 0b9cf2f  "CAMEL-13454:camel-testcontainers - Should build if no docker"
0b9cf2f is described below

commit 0b9cf2f1d9557e63d10950dff3578bcdfd989171
Author: Kodanda Ramu Kakarla 
AuthorDate: Mon Jul 8 22:24:06 2019 +0530

"CAMEL-13454:camel-testcontainers - Should build if no docker"
---
 components/camel-testcontainers/pom.xml | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/components/camel-testcontainers/pom.xml 
b/components/camel-testcontainers/pom.xml
index 19e6356..c882cf5 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -76,6 +76,22 @@
 
 
 
+  
+testcontainers-skip-tests
+
+true
+
+
+
+
+maven-surefire-plugin
+
+true
+
+
+
+
+
 
 
 testcontainers-integration-tests-docker-file
@@ -90,6 +106,7 @@
 org.apache.maven.plugins
 maven-failsafe-plugin
 
+${skipTests}
 
 
true
 
@@ -121,6 +138,7 @@
 org.apache.maven.plugins
 maven-failsafe-plugin
 
+${skipTests}
 
 
true