Repository: servicemix Updated Branches: refs/heads/master eab102970 -> 331eeafa6
SM-2768: Upgrade to Apache Karaf 4 Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/331eeafa Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/331eeafa Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/331eeafa Branch: refs/heads/master Commit: 331eeafa6dc218d5d4e03e3360304f715845c116 Parents: eab1029 Author: Krzysztof Sobkowiak <[email protected]> Authored: Fri Jan 29 23:55:40 2016 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Fri Jan 29 23:55:40 2016 +0100 ---------------------------------------------------------------------- assemblies/apache-servicemix/pom.xml | 9 +++++++++ assemblies/pom.xml | 2 +- parent/pom.xml | 6 ------ 3 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/331eeafa/assemblies/apache-servicemix/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml index 15907d9..cc588c7 100644 --- a/assemblies/apache-servicemix/pom.xml +++ b/assemblies/apache-servicemix/pom.xml @@ -130,8 +130,17 @@ <dependency> <groupId>org.apache.servicemix</groupId> <artifactId>org.apache.servicemix.branding</artifactId> + <version>${project.version}</version> + <scope>provided</scope> </dependency> + <!-- examples --> + <dependency> + <groupId>org.apache.servicemix</groupId> + <artifactId>apache-servicemix-examples</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <repositories> http://git-wip-us.apache.org/repos/asf/servicemix/blob/331eeafa/assemblies/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/pom.xml b/assemblies/pom.xml index 7bbfb8f..2cef2a9 100644 --- a/assemblies/pom.xml +++ b/assemblies/pom.xml @@ -35,8 +35,8 @@ <modules> <module>features</module> - <module>apache-servicemix</module> <module>apache-servicemix-examples</module> + <module>apache-servicemix</module> </modules> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/servicemix/blob/331eeafa/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 89c34cf..a9fc48b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -151,12 +151,6 @@ <classifier>features</classifier> </dependency> - <dependency> - <groupId>org.apache.servicemix</groupId> - <artifactId>org.apache.servicemix.branding</artifactId> - <version>${project.version}</version> - </dependency> - <!-- Apache ActiveMQ --> <dependency> <groupId>org.apache.activemq</groupId>
