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-examples.git
The following commit(s) were added to refs/heads/master by this push:
new 00a18ce CAMEL-16520: camel-spring-boot - Auto configuration options
for cloud and cluster should not clash with component
00a18ce is described below
commit 00a18ce2a0e071184c4cf3ad0289cdea345ec9f1
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Apr 16 09:59:45 2021 +0200
CAMEL-16520: camel-spring-boot - Auto configuration options for cloud and
cluster should not clash with component
---
rest-jpa/src/main/resources/application-dev.yml | 7 +++----
rest-jpa/src/main/resources/application.yml | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/rest-jpa/src/main/resources/application-dev.yml
b/rest-jpa/src/main/resources/application-dev.yml
index ae9ae34..0796dde 100644
--- a/rest-jpa/src/main/resources/application-dev.yml
+++ b/rest-jpa/src/main/resources/application-dev.yml
@@ -20,10 +20,9 @@ camel:
# The Camel context name
name: CamelRestJpa
- component:
- servlet:
- mapping:
- contextPath: /camel-rest-jpa/*
+ servlet:
+ mapping:
+ contextPath: /camel-rest-jpa/*
spring:
# Spring JDBC configuration
diff --git a/rest-jpa/src/main/resources/application.yml
b/rest-jpa/src/main/resources/application.yml
index f473f45..81995e7 100644
--- a/rest-jpa/src/main/resources/application.yml
+++ b/rest-jpa/src/main/resources/application.yml
@@ -21,10 +21,9 @@ camel:
name: CamelRestJpa
rest:
component: servlet
- component:
- servlet:
- mapping:
- contextPath: /camel-rest-jpa/*
+ servlet:
+ mapping:
+ contextPath: /camel-rest-jpa/*
mysql:
service:
