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 2021/01/30 13:30:50 UTC
[camel-spring-boot] branch camel-spring-boot-3.7.x updated:
CAMEL-16109: Fixed camel-hystrix-starter to not create clash with
camel-servlet-starter
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-3.7.x by this push:
new 5dd9ab0 CAMEL-16109: Fixed camel-hystrix-starter to not create clash with camel-servlet-starter
5dd9ab0 is described below
commit 5dd9ab06c49beecc8da01c009db705609b29fe2d
Author: Claus Ibsen <cl...@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 01071a7..69e52d6 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());