[camel] 02/02: Upgrade to Spring Boot 2.0.2, exclude managing kafka in Camel BOM for Spring Boot as its now managed by Spring Boot itself.

[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.git

commit cf308f1a32aaeb84ad03d27fd6e15a095f740e10
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue May 15 12:10:46 2018 +0200

    Upgrade to Spring Boot 2.0.2, exclude managing kafka in Camel BOM for 
Spring Boot as its now managed by Spring Boot itself.
---
 .../components-starter/camel-kafka-starter/pom.xml            | 11 +++++++++++
 .../camel-spring-boot-dependencies-generator/pom.xml          |  3 +++
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml     | 10 ----------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git 
a/platforms/spring-boot/components-starter/camel-kafka-starter/pom.xml 
b/platforms/spring-boot/components-starter/camel-kafka-starter/pom.xml
index 1314596..eb1b952 100644
--- a/platforms/spring-boot/components-starter/camel-kafka-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-kafka-starter/pom.xml
@@ -38,6 +38,17 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kafka</artifactId>
       <version>${project.version}</version>
+      <!-- managed by spring boot BOM -->
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.kafka</groupId>
+          <artifactId>kafka_2.11</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.kafka</groupId>
+          <artifactId>kafka-clients</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
index 045f17a..fb18509 100644
--- 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
+++ 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
@@ -169,6 +169,9 @@
               <exclude>org.scala-lang:*</exclude>
               <exclude>org.apache.lucene:*</exclude>
 
+              <!-- Kafka -->
+              <exclude>org.apache.kafka:*</exclude>
+
               <!-- Jetty -->
               <exclude>org.eclipse.jetty:jetty-rewrite</exclude>
               <exclude>org.eclipse.jetty:jetty-util-ajax</exclude>
diff --git 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 961e7d0..e56a48d 100644
--- 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3250,16 +3250,6 @@
         <version>1.1.1</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.kafka</groupId>
-        <artifactId>kafka-clients</artifactId>
-        <version>1.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.kafka</groupId>
-        <artifactId>kafka_2.11</artifactId>
-        <version>1.0.1</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-core</artifactId>
         <version>2.0.17</version>

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.