[camel-spring-boot] branch master updated (6897453 -> b9d891d)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel-spring-boot] branch master updated (6897453 -> b9d891d)

davsclaus-2
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.


    from 6897453  Merge pull request #6 from valdar/fixBuildActionProblems
     new 4b281d4  Fixed test after core changes
     new b9d891d  Regen

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 components-starter/camel-corda-starter/pom.xml               | 12 ------------
 .../processor/HystrixHierarchicalConfigurationTest.java      |  8 ++++++--
 2 files changed, 6 insertions(+), 14 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[camel-spring-boot] 01/02: Fixed test after core changes

davsclaus-2
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

commit 4b281d45f82fe34e4f29ce6dc40361b70509e12e
Author: Claus Ibsen <[hidden email]>
AuthorDate: Wed Feb 12 05:55:18 2020 +0100

    Fixed test after core changes
---
 .../hystrix/processor/HystrixHierarchicalConfigurationTest.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java b/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java
index 28a7254..06ffa2c 100644
--- a/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java
+++ b/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java
@@ -17,10 +17,13 @@
 package org.apache.camel.component.hystrix.processor;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.impl.engine.DefaultRouteContext;
 import org.apache.camel.model.CircuitBreakerDefinition;
 import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.Model;
+import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.spi.RouteContext;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,8 +59,9 @@ public class HystrixHierarchicalConfigurationTest {
 
         Assert.assertNotNull(hystrixDefinition);
 
-        HystrixReifier reifier = new HystrixReifier(hystrixDefinition);
-        HystrixConfigurationDefinition config = reifier.buildHystrixConfiguration(camelContext);
+        RouteContext rc = new DefaultRouteContext(camelContext, routeDefinition, "hystrix-route");
+        HystrixReifier reifier = new HystrixReifier(rc, hystrixDefinition);
+        HystrixConfigurationDefinition config = reifier.buildHystrixConfiguration();
 
         Assert.assertEquals("local-conf-group-key", config.getGroupKey());
         Assert.assertEquals("global-thread-key", config.getThreadPoolKey());

Reply | Threaded
Open this post in threaded view
|

[camel-spring-boot] 02/02: Regen

davsclaus-2
In reply to this post by davsclaus-2
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

commit b9d891d856698a6da916133d8e7e86ba8c2b9983
Author: Claus Ibsen <[hidden email]>
AuthorDate: Wed Feb 12 05:59:23 2020 +0100

    Regen
---
 components-starter/camel-corda-starter/pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml
index d834111..47eae69 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,18 +38,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-corda</artifactId>
       <version>${camel-version}</version>
-      <!--START OF GENERATED CODE-->
-      <exclusions>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-core</artifactId>
-        </exclusion>
-      </exclusions>
-      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>