You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/03/01 11:48:01 UTC
[4/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
CAMEL-8331: OSGi bundle upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13dd3684
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13dd3684
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13dd3684
Branch: refs/heads/master
Commit: 13dd3684314ec50327c7e1e329829915366fcfd7
Parents: 995ac55
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 1 09:58:05 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 1 09:58:05 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 6 +++---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/13dd3684/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 243a8511..055c598 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -250,7 +250,7 @@
<jcr-version>2.0</jcr-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<jdom-version>1.1.3</jdom-version>
- <jedis-client-bundle-version>2.1.0_1</jedis-client-bundle-version>
+ <jedis-client-bundle-version>2.6.2_1</jedis-client-bundle-version>
<jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
<jetty6-version>6.1.26</jetty6-version>
<jetty8-version>8.1.16.v20140903</jetty8-version>
@@ -359,7 +359,6 @@
<oncrpc-version>1.1.2</oncrpc-version>
<openejb-version>4.6.0.2</openejb-version>
<openjpa-version>2.3.0</openjpa-version>
- <opensaml-version>2.5.1_2</opensaml-version>
<openshift-java-client-version>2.5.0.Final</openshift-java-client-version>
<optaplanner-version>6.1.0.Final</optaplanner-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
@@ -400,7 +399,8 @@
<scala-maven-plugin-version>3.2.0</scala-maven-plugin-version>
<scalatest-version>2.2.0</scalatest-version>
<scalaxml-version>1.0.3</scalaxml-version>
- <scribe-version>1.3.5</scribe-version>
+ <scribe-version>1.3.7</scribe-version>
+ <scribe-bundle-version>1.3.7_1</scribe-bundle-version>
<scriptengines-version>1.1.1</scriptengines-version>
<serp-bundle-version>1.14.1_1</serp-bundle-version>
<servicemix-specs-version>2.2.0</servicemix-specs-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/13dd3684/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 8c4e9e4..59fba34 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1571,7 +1571,7 @@
<feature name='camel-yammer' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.scribe/scribe/${scribe-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scribe/${scribe-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-yammer/${project.version}</bundle>
</feature>