You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/05 11:48:53 UTC
[camel-spring-boot] 01/04: Camel-Spring-Boot: Fixed build
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit e8e44017b9c86ff0c9fc6a2dc81ea78cf539ecf0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 5 12:28:49 2020 +0100
Camel-Spring-Boot: Fixed build
---
.../boot/cluster/ClusteredRouteControllerAutoConfiguration.java | 8 ++++----
.../camel/spring/boot/SupervisingRouteControllerRestartTest.java | 4 ++--
tooling/camel-spring-boot-dependencies/pom.xml | 5 +++++
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
index 25be33f..e7d7ddb 100644
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
+++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
@@ -23,11 +23,11 @@ import java.util.Map;
import java.util.Optional;
import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.cluster.ClusteredRouteConfiguration;
+import org.apache.camel.cluster.ClusteredRouteController;
+import org.apache.camel.cluster.ClusteredRouteFilter;
+import org.apache.camel.cluster.ClusteredRouteFilters;
import org.apache.camel.converter.TimePatternConverter;
-import org.apache.camel.impl.cluster.ClusteredRouteConfiguration;
-import org.apache.camel.impl.cluster.ClusteredRouteController;
-import org.apache.camel.impl.cluster.ClusteredRouteFilter;
-import org.apache.camel.impl.cluster.ClusteredRouteFilters;
import org.apache.camel.spi.RouteController;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.util.ObjectHelper;
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
index 22cb93a..a4257c4 100644
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
+++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
@@ -81,7 +81,7 @@ public class SupervisingRouteControllerRestartTest {
// restart the dummy route which should fail on first attempt
controller.stopRoute("dummy");
- Assert.assertNull(context.getRoute("dummy").getRouteContext().getRouteController());
+ Assert.assertNull(context.getRoute("dummy").getRouteController());
try {
controller.startRoute("dummy");
@@ -97,7 +97,7 @@ public class SupervisingRouteControllerRestartTest {
await().atMost(2, TimeUnit.SECONDS).untilAsserted(() -> {
// now its suspended by the policy
Assert.assertEquals(ServiceStatus.Started, context.getRouteController().getRouteStatus("dummy"));
- Assert.assertNotNull(context.getRoute("dummy").getRouteContext().getRouteController());
+ Assert.assertNotNull(context.getRoute("dummy").getRouteController());
Assert.assertFalse(controller.getBackOffContext("dummy").isPresent());
});
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 978d161..631b35e 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -2350,6 +2350,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-core-osgi</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>