You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2015/08/03 16:20:45 UTC
camel git commit: Update flatpack version
Repository: camel
Updated Branches:
refs/heads/master 71caabc6a -> 1ba507798
Update flatpack version
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1ba50779
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1ba50779
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1ba50779
Branch: refs/heads/master
Commit: 1ba507798f8428eac791ae29b5855b9e14798c09
Parents: 71caabc
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Aug 3 10:20:29 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Aug 3 10:20:29 2015 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1ba50779/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8738e01..654d7b8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -158,7 +158,7 @@
<felix-framework-version>3.2.2</felix-framework-version>
<felix-scr-annotations-version>1.9.12</felix-scr-annotations-version>
<findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
- <flatpack-version>3.4.2</flatpack-version>
+ <flatpack-version>3.4.3</flatpack-version>
<fop-bundle-version>1.1_1</fop-bundle-version>
<fop-version>1.1</fop-version>
<ftpserver-version>1.0.6</ftpserver-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/1ba50779/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 1d18bdf..6c97436 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -409,9 +409,7 @@
<feature name='camel-flatpack' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
- <!-- when flatpack 3.4.3 is released, we can use this as the jexcelapi deps will be optional. Tell then, use the latest smx bundle -->
- <!--bundle dependency='true'>mvn:net.sf.flatpack/flatpack/${flatpack-version}</bundle-->
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/3.2.0_2</bundle>
+ <bundle dependency='true'>mvn:net.sf.flatpack/flatpack/${flatpack-version}</bundle>
<bundle>mvn:org.apache.camel/camel-flatpack/${project.version}</bundle>
</feature>
<feature name='camel-fop' version='${project.version}' resolver='(obr)' start-level='50'>