You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2016/01/25 22:02:35 UTC
[11/16] servicemix git commit: SM-2803: Refactor the assembly creation
SM-2803: Refactor the assembly creation
- Karaf BOM moved before Camel BOM to have higher priority
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/e1ba137d
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/e1ba137d
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/e1ba137d
Branch: refs/heads/servicemix-6.x
Commit: e1ba137dc30cd52dccd5c540c1bd92cf68b78c2c
Parents: 367c8de
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jan 15 06:39:04 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jan 15 06:41:02 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/e1ba137d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b13545d..0841170 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -111,7 +111,17 @@
<!-- Managed dependencies -->
<dependencyManagement>
<dependencies>
- <!-- managed dependencies for all the Camel components -->
+
+ <!-- Apache Karaf BOM -->
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Apache Camel BOM -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
@@ -120,6 +130,7 @@
<scope>import</scope>
</dependency>
+ <!-- managed dependencies for all the Camel components -->
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>apache-camel</artifactId>
@@ -201,13 +212,6 @@
<!-- Apache Karaf -->
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
- <version>${karaf.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<version>${karaf.version}</version>