You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2017/04/18 09:28:42 UTC
camel git commit: CAMEL-11154: do not load test dependencies
Repository: camel
Updated Branches:
refs/heads/master a49af7f1d -> e961a2a8e
CAMEL-11154: do not load test dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e961a2a8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e961a2a8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e961a2a8
Branch: refs/heads/master
Commit: e961a2a8e2ae7cad611cdfd42bf115d23ab891b4
Parents: a49af7f
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Tue Apr 18 11:28:17 2017 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Tue Apr 18 11:28:26 2017 +0200
----------------------------------------------------------------------
.../apache/camel/itest/springboot/ITestConfigBuilder.java | 10 ++++++++++
.../org/apache/camel/itest/springboot/CamelHbaseTest.java | 8 ++------
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e961a2a8/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
index 98c0e99..647b8ef 100644
--- a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
+++ b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
@@ -155,6 +155,16 @@ public class ITestConfigBuilder {
return this;
}
+ public ITestConfigBuilder includeTestDependencies(Boolean includeTestDependencies) {
+ config.setIncludeTestDependencies(includeTestDependencies);
+ return this;
+ }
+
+ public ITestConfigBuilder unitTestsEnabled(Boolean unitTestsEnabled) {
+ config.setUnitTestEnabled(unitTestsEnabled);
+ return this;
+ }
+
public ITestConfig build() {
// Checking conditions
http://git-wip-us.apache.org/repos/asf/camel/blob/e961a2a8/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHbaseTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHbaseTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHbaseTest.java
index 20cd0d7..014937f 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHbaseTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHbaseTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.itest.springboot;
import org.apache.camel.itest.springboot.util.ArquillianPackager;
-import org.apache.camel.itest.springboot.util.DependencyResolver;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
@@ -36,11 +35,8 @@ public class CamelHbaseTest extends AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelHbaseTest.class))
- // Because HBase uses Hadoop 2.5.1 in test scope
- .dependency("org.apache.hadoop:hadoop-common:" + DependencyResolver.resolveParentProperty("${hadoop2-version}"))
- .dependency("org.apache.hadoop:hadoop-auth:" + DependencyResolver.resolveParentProperty("${hadoop2-version}"))
- .dependency("org.apache.hadoop:hadoop-mapreduce-client-core:" + DependencyResolver.resolveParentProperty("${hadoop2-version}"))
- .dependency("org.apache.hadoop:hadoop-yarn-common:" + DependencyResolver.resolveParentProperty("${hadoop2-version}"))
+ .unitTestsEnabled(false)
+ .includeTestDependencies(false)
.build();
}