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 2013/07/01 18:41:08 UTC
git commit: Sync a couple versions with CXF to reduce some duplicates
in Karaf/SMX
Updated Branches:
refs/heads/camel-2.10.x 830fd5b28 -> 485abd3fd
Sync a couple versions with CXF to reduce some duplicates in Karaf/SMX
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/485abd3f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/485abd3f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/485abd3f
Branch: refs/heads/camel-2.10.x
Commit: 485abd3fd1b90006722cbba8091acd5f80e3b423
Parents: 830fd5b
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jul 1 12:40:14 2013 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 1 12:40:14 2013 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
platforms/karaf/features/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/485abd3f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a1936ea..d7c8dcc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -179,7 +179,7 @@
<scala-version>2.9.1</scala-version>
<scala-plugin-version>2.15.2</scala-plugin-version>
<scala-maven-plugin-version>3.1.0</scala-maven-plugin-version>
- <servicemix-specs-version>1.9.0</servicemix-specs-version>
+ <servicemix-specs-version>2.2.0</servicemix-specs-version>
<shiro-version>1.2.0</shiro-version>
<slf4j-api-version>1.6.6</slf4j-api-version>
<slf4j-version>1.6.6</slf4j-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/485abd3f/platforms/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index e94670c..0231269 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -120,9 +120,9 @@
<tagsoup-bundle-version>1.2_5</tagsoup-bundle-version>
<twitter4j-bundle-version>2.2.5_2</twitter4j-bundle-version>
<velocity-bundle-version>1.7_5</velocity-bundle-version>
- <xalan-bundle-version>2.7.1_5</xalan-bundle-version>
+ <xalan-bundle-version>2.7.1_6</xalan-bundle-version>
<xerces-bundle-version>2.9.1_5</xerces-bundle-version>
- <xmlbeans-bundle-version>2.5.0_2</xmlbeans-bundle-version>
+ <xmlbeans-bundle-version>2.6.0_2</xmlbeans-bundle-version>
<xmlschema-version>2.0</xmlschema-version>
<xmlresolver-bundle-version>1.2_5</xmlresolver-bundle-version>
<xpp3-bundle-version>1.1.4c_6</xpp3-bundle-version>