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/02/13 15:26:38 UTC
[camel-spring-boot] branch master updated: CAMEL-14548:
resilience4j doesn't catch configuration from spring boot
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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 9167057 CAMEL-14548: resilience4j doesn't catch configuration from spring boot
9167057 is described below
commit 916705758f2f4758da246dc528971293e713c0cd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Feb 13 16:26:11 2020 +0100
CAMEL-14548: resilience4j doesn't catch configuration from spring boot
---
.../client/src/main/java/sample/camel/ClientApplication.java | 5 +----
.../camel-example-spring-boot-resilience4j/client2/pom.xml | 12 ++++++++----
.../camel-example-spring-boot-resilience4j/service2/pom.xml | 4 ----
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/examples/camel-example-spring-boot-resilience4j/client/src/main/java/sample/camel/ClientApplication.java b/examples/camel-example-spring-boot-resilience4j/client/src/main/java/sample/camel/ClientApplication.java
index 1c493cd..bda2eab 100644
--- a/examples/camel-example-spring-boot-resilience4j/client/src/main/java/sample/camel/ClientApplication.java
+++ b/examples/camel-example-spring-boot-resilience4j/client/src/main/java/sample/camel/ClientApplication.java
@@ -23,10 +23,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* A Spring Boot application that runs the Camel Resilience client application that calls service 1 and service 2 (as fallback)
*/
@SpringBootApplication
-public final class ClientApplication {
-
- private ClientApplication() {
- }
+public class ClientApplication {
/**
* A main method to start this application.
diff --git a/examples/camel-example-spring-boot-resilience4j/client2/pom.xml b/examples/camel-example-spring-boot-resilience4j/client2/pom.xml
index d9899e4..2194ffc 100644
--- a/examples/camel-example-spring-boot-resilience4j/client2/pom.xml
+++ b/examples/camel-example-spring-boot-resilience4j/client2/pom.xml
@@ -46,23 +46,27 @@
<dependencies>
- <!-- camel-core -->
+ <!-- camel -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>camel-main</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-main</artifactId>
+ <artifactId>camel-resilience4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-resilience4j</artifactId>
+ <artifactId>camel-bean</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-timer</artifactId>
+ </dependency>
</dependencies>
diff --git a/examples/camel-example-spring-boot-resilience4j/service2/pom.xml b/examples/camel-example-spring-boot-resilience4j/service2/pom.xml
index 1a29440..a16c480 100644
--- a/examples/camel-example-spring-boot-resilience4j/service2/pom.xml
+++ b/examples/camel-example-spring-boot-resilience4j/service2/pom.xml
@@ -49,10 +49,6 @@
<!-- camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-main</artifactId>
</dependency>
<dependency>