[camel-spring-boot] branch master updated: CAMEL-16109: Fixed camel-hystrix-starter to not create clash with camel-servlet-starter

[davsclaus]

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 998be66  CAMEL-16109: Fixed camel-hystrix-starter to not create clash 
with camel-servlet-starter
998be66 is described below

commit 998be668bfcf4d60f16428eed56129b0c8d0fb8d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Jan 30 14:28:52 2021 +0100

    CAMEL-16109: Fixed camel-hystrix-starter to not create clash with 
camel-servlet-starter
---
 components-starter/camel-hystrix-starter/pom.xml                        | 2 +-
 .../component/hystrix/springboot/HystrixMappingAutoConfiguration.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components-starter/camel-hystrix-starter/pom.xml 
b/components-starter/camel-hystrix-starter/pom.xml
index 045da78..4ca3099 100644
--- a/components-starter/camel-hystrix-starter/pom.xml
+++ b/components-starter/camel-hystrix-starter/pom.xml
@@ -26,7 +26,7 @@
   </parent>
   <artifactId>camel-hystrix-starter</artifactId>
   <packaging>jar</packaging>
-  <name>Camel SB Starters :: Hystrix</name>
+  <name>Camel SB Starters :: Hystrix (deprecated)</name>
   <description>Spring-Boot Starter for Camel Hystrix support</description>
   <dependencies>
     <dependency>
diff --git 
a/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingAutoConfiguration.java
 
b/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingAutoConfiguration.java
index 2a9a203..42b0a95 100644
--- 
a/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingAutoConfiguration.java
+++ 
b/components-starter/camel-hystrix-starter/src/main/java/org/apache/camel/component/hystrix/springboot/HystrixMappingAutoConfiguration.java
@@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration;
 public class HystrixMappingAutoConfiguration {
 
     @Bean
-    ServletRegistrationBean 
servletRegistrationBean(HystrixMappingConfiguration config) {
+    ServletRegistrationBean hystrixServlet(HystrixMappingConfiguration config) 
{
         ServletRegistrationBean mapping = new ServletRegistrationBean();
         mapping.setServlet(new HystrixEventStreamServlet());
         mapping.addUrlMappings(config.getPath());