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/30 09:08:01 UTC
[camel-spring-boot] 01/02: 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 21ffbed6ef1ff62413796daf78c691e5b4a7b35f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 30 11:00:39 2020 +0200
Camel-Spring-Boot: Fixed build
---
components-starter/camel-spring-boot-starter/pom.xml | 16 ++++++++++++++++
.../ClusteredRouteControllerAutoConfiguration.java | 8 ++++----
tooling/camel-spring-boot-dependencies/pom.xml | 20 ++++++++++----------
3 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/components-starter/camel-spring-boot-starter/pom.xml b/components-starter/camel-spring-boot-starter/pom.xml
index 5760e35..c1ca9d2 100644
--- a/components-starter/camel-spring-boot-starter/pom.xml
+++ b/components-starter/camel-spring-boot-starter/pom.xml
@@ -48,6 +48,22 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
</exclusions>
<!--END OF GENERATED CODE-->
</dependency>
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 7ceab96..7002d3d 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
@@ -24,10 +24,10 @@ import java.util.Optional;
import org.apache.camel.catalog.impl.TimePatternConverter;
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.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;
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index deee0ee..dd2b0a1 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -758,6 +758,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-elytron-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-etcd-starter</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1969,6 +1974,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-avro-rpc</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-aws-cw</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
@@ -2304,11 +2314,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-commands-core</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-componentdsl</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
@@ -3556,11 +3561,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-karaf</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-test-spring</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>