camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject camel git commit: CAMEL-9082 Upgrade ServiceMix Specs to 2.5.0.
Date Fri, 14 Aug 2015 18:39:17 GMT
Repository: camel
Updated Branches:
  refs/heads/master cda9eb838 -> cdbdfb5c1


CAMEL-9082 Upgrade ServiceMix Specs to 2.5.0.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cdbdfb5c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cdbdfb5c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cdbdfb5c

Branch: refs/heads/master
Commit: cdbdfb5c15438b4852e8267db3176fa017953a90
Parents: cda9eb8
Author: Raul Kripalani <raulk@apache.org>
Authored: Fri Aug 14 19:38:58 2015 +0100
Committer: Raul Kripalani <raulk@apache.org>
Committed: Fri Aug 14 19:38:58 2015 +0100

----------------------------------------------------------------------
 parent/pom.xml                                           | 3 +--
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cdbdfb5c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 70581b8..d9bc3f7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -426,8 +426,7 @@
     <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.4.0</servicemix-specs-version>
-    <servicemix-specs-2.5.0-version>2.5.0</servicemix-specs-2.5.0-version>
+    <servicemix-specs-version>2.5.0</servicemix-specs-version>
     <servlet-api-3.0-version>1.0</servlet-api-3.0-version>
     <servlet-version-range>[2.5,4)</servlet-version-range>
     <shiro-version>1.2.3</shiro-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/cdbdfb5c/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 708b898..45323e4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1320,7 +1320,7 @@
   </feature>
   <feature name='camel-sip' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2.1/${servicemix-specs-2.5.0-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2.1/${servicemix-specs-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jain-sip-ri/${jain-sip-ri-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-sip/${project.version}</bundle>
   </feature>


Mime
View raw message