camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/9] camel git commit: CAMEL-11756: Regen with spring boot 1
Date Sun, 10 Sep 2017 10:47:05 GMT
CAMEL-11756: Regen with spring boot 1


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/38649277
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/38649277
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/38649277

Branch: refs/heads/boot2
Commit: 386492774dcde095ddef4d42be226e6055771755
Parents: 90a5002
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Sep 10 11:07:32 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Sep 10 11:07:32 2017 +0200

----------------------------------------------------------------------
 .../components-starter/camel-spring-starter/pom.xml          | 8 ++++++++
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml    | 5 +++++
 2 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/38649277/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml
index f1f96e4..f649b30e 100644
--- a/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml
@@ -38,6 +38,14 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
       <version>${project.version}</version>
+      <!--START OF GENERATED CODE-->
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/38649277/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
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 ebc5283..5c855d7 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
@@ -2461,6 +2461,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-spring-boot-common</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring-boot-starter</artifactId>
         <version>${project.version}</version>
       </dependency>


Mime
View raw message