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 2016/07/04 17:53:18 UTC

[6/6] camel git commit: CAMEL-10118: Small fix and source check

CAMEL-10118: Small fix and source check


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

Branch: refs/heads/master
Commit: f7f401933bfc5e2e1351b210855f4a7197964fa0
Parents: 6694368
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Mon Jul 4 18:22:13 2016 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Mon Jul 4 18:22:13 2016 +0200

----------------------------------------------------------------------
 .../camel/itest/springboot/CamelZipkinStarterTest.java    |  1 +
 .../camel/itest/springboot/util/ArquillianPackager.java   | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f7f40193/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZipkinStarterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZipkinStarterTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZipkinStarterTest.java
index 8d32563..5a73d25 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZipkinStarterTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZipkinStarterTest.java
@@ -35,6 +35,7 @@ public class CamelZipkinStarterTest extends AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelZipkinStarterTest.class))
+                .unitTestExpectedNumber(0)
                 .build();
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/f7f40193/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 985427b..4cb453f3 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
@@ -281,8 +281,14 @@ public final class ArquillianPackager {
 
     private static boolean validTestDependency(ITestConfig config, MavenCoordinate coordinate) {
 
-        Pattern[] patterns = new Pattern[]{Pattern.compile("^log4j$"), Pattern.compile("^slf4j-log4j12$"), Pattern.compile("^slf4j-simple$"), Pattern.compile("^slf4j-jdk14$"), Pattern.compile
-                ("^logback-classic$"), Pattern.compile("^logback-core$")};
+        Pattern[] patterns = new Pattern[]{
+                Pattern.compile("^log4j$"),
+                Pattern.compile("^slf4j-log4j12$"),
+                Pattern.compile("^slf4j-simple$"),
+                Pattern.compile("^slf4j-jdk14$"),
+                Pattern.compile("^logback-classic$"),
+                Pattern.compile("^logback-core$")
+        };
 
         boolean valid = true;
         for (Pattern p : patterns) {