CAMEL-10222: Stable version

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

Branch: refs/heads/master
Commit: c39db2d390351807f4f0378b15d96bc3e7330e64
Parents: 9de5089
Author: Nicola Ferraro <ni.ferr...@gmail.com>
Authored: Tue Sep 6 12:17:41 2016 +0200
Committer: Nicola Ferraro <ni.ferr...@gmail.com>
Committed: Tue Sep 20 00:38:40 2016 +0200

----------------------------------------------------------------------
 spring-boot-dm/camel-spring-boot-bom/pom.xml | 16 ++++++++++++++++
 spring-boot-dm/camel-starter-parent/pom.xml  | 13 ++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c39db2d3/spring-boot-dm/camel-spring-boot-bom/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/camel-spring-boot-bom/pom.xml 
b/spring-boot-dm/camel-spring-boot-bom/pom.xml
index f18ada6..914a08e 100644
--- a/spring-boot-dm/camel-spring-boot-bom/pom.xml
+++ b/spring-boot-dm/camel-spring-boot-bom/pom.xml
@@ -19,6 +19,22 @@
 
         <dependencies>
 
+
+
+            <!-- Caffeine - Mismatch resolved in favor of camel version -->
+            <dependency>
+                <groupId>com.github.ben-manes.caffeine</groupId>
+                <artifactId>caffeine</artifactId>
+                <version>${caffeine-version}</version>
+            </dependency>
+
+            <!-- Missing from spring-boot -->
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-entitymanager</artifactId>
+                <version>${hibernate-version}</version>
+            </dependency>
+
             <!-- Common -->
             <dependency>
                 <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/c39db2d3/spring-boot-dm/camel-starter-parent/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/camel-starter-parent/pom.xml 
b/spring-boot-dm/camel-starter-parent/pom.xml
index 6c122f9..03c1c77 100644
--- a/spring-boot-dm/camel-starter-parent/pom.xml
+++ b/spring-boot-dm/camel-starter-parent/pom.xml
@@ -49,12 +49,7 @@
 
             <!-- Custom dependencies that should be automatically applied -->
 
-            <!-- Caffeine - Mismatch resolved in favor of camel version -->
-            <dependency>
-                <groupId>com.github.ben-manes.caffeine</groupId>
-                <artifactId>caffeine</artifactId>
-                <version>${caffeine-version}</version>
-            </dependency>
+
 
 
 
@@ -139,11 +134,7 @@
                 <!--<version>${netty-version}</version>-->
             <!--</dependency>-->
 
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-entitymanager</artifactId>
-                <version>${hibernate-version}</version>
-            </dependency>
+
 
 
             <!-- Import the spring-boot dependencies -->

Reply via email to