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 2020/12/22 07:40:04 UTC
[camel] branch master updated: Move camel-core-health unit tests to
camel-core due to circular build dependency problem
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 0203888 Move camel-core-health unit tests to camel-core due to circular build dependency problem
0203888 is described below
commit 0203888f910ce58f835c48e07502837a2a0c7805
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 22 07:20:56 2020 +0100
Move camel-core-health unit tests to camel-core due to circular build dependency problem
---
.../health/DefaultHealthCheckRegistryTest.java | 0
.../apache/camel/impl/health/HealthCheckTest.java | 0
.../impl/health/ReadinessAndLivenessTest.java | 0
.../camel/impl/health/RouteHealthCheckTest.java | 0
core/camel-health/pom.xml | 32 --------------------
.../src/test/resources/log4j2.properties | 35 ----------------------
6 files changed, 67 deletions(-)
diff --git a/core/camel-health/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java
similarity index 100%
rename from core/camel-health/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java
rename to core/camel-core/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java
diff --git a/core/camel-health/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java
similarity index 100%
rename from core/camel-health/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java
rename to core/camel-core/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java
diff --git a/core/camel-health/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java
similarity index 100%
rename from core/camel-health/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java
rename to core/camel-core/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java
diff --git a/core/camel-health/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java
similarity index 100%
rename from core/camel-health/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java
rename to core/camel-core/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java
diff --git a/core/camel-health/pom.xml b/core/camel-health/pom.xml
index e1c4a78..e8cee83 100644
--- a/core/camel-health/pom.xml
+++ b/core/camel-health/pom.xml
@@ -50,38 +50,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <!-- testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-languages</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-direct</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-log</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-mock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/core/camel-health/src/test/resources/log4j2.properties b/core/camel-health/src/test/resources/log4j2.properties
deleted file mode 100644
index ea3bee8..0000000
--- a/core/camel-health/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-appender.console.type = Console
-appender.console.name = console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-appender.file.type = File
-appender.file.name = file
-appender.file.fileName = target/camel-health-test.log
-appender.file.append = true
-appender.file.layout.type = PatternLayout
-appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-rootLogger.level = INFO
-
-rootLogger.appenderRef.file.ref = file
-#rootLogger.appenderRef.console.ref = console
-
-#logger.camel-core.name = org.apache.camel
-#logger.camel-core.level = TRACE