Author: hadrian
Date: Wed Dec 8 17:36:52 2010
New Revision: 1043538
URL: http://svn.apache.org/viewvc?rev=1043538&view=rev
Log:
CAMEL-3410. Patch applied with thanks to Jean Baptiste
Modified:
camel/trunk/components/camel-sip/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-sip/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/pom.xml?rev=1043538&r1=1043537&r2=1043538&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/pom.xml (original)
+++ camel/trunk/components/camel-sip/pom.xml Wed Dec 8 17:36:52 2010
@@ -37,31 +37,21 @@
org.apache.camel.component.sip.*
</camel.osgi.export.pkg>
</properties>
-
- <repositories>
- <repository>
- <id>jboss</id>
-
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
- <dependency>
- <groupId>javax.sip</groupId>
- <artifactId>jain-sip-api</artifactId>
- <version>${jain-api-version}</version>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+
<artifactId>org.apache.servicemix.specs.jain-sip-api-1.2</artifactId>
+ <version>${servicemix-specs-version}</version>
</dependency>
<dependency>
- <groupId>javax.sip</groupId>
- <artifactId>jain-sip-ri</artifactId>
- <version>${jain-sip-version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+
<artifactId>org.apache.servicemix.bundles.jain-sip-ri</artifactId>
+ <version>${jain-sip-ri-bundle-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1043538&r1=1043537&r2=1043538&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Dec 8 17:36:52 2010
@@ -84,8 +84,7 @@
<httpclient-version>3.1</httpclient-version>
<icu4j-version>4.0.1</icu4j-version>
<jackson-version>1.6.0</jackson-version>
- <jain-api-version>1.2</jain-api-version>
- <jain-sip-version>1.2.153</jain-sip-version>
+ <jain-sip-ri-bundle-version>1.2.154_1</jain-sip-ri-bundle-version>
<jasypt-version>1.6</jasypt-version>
<javassist-version>3.9.0.GA</javassist-version>
<javax-mail-version>1.4.3</javax-mail-version>
@@ -120,6 +119,7 @@
<saxon-version>9.1.0.8</saxon-version>
<scala-version>2.8.0</scala-version>
<scala-plugin-version>2.14.1</scala-plugin-version>
+ <servicemix-specs-version>1.6.0</servicemix-specs-version>
<shiro-version>1.0.0-incubating</shiro-version>
<slf4j-version>1.6.1</slf4j-version>
<smack-version>3.1.0</smack-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1043538&r1=1043537&r2=1043538&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Dec 8 17:36:52 2010
@@ -110,7 +110,6 @@
<rome-bundle-version>1.0_1</rome-bundle-version>
<saxon-bundle-version>9.1.0.1_3</saxon-bundle-version>
<scala-bundle-version>2.8.0_1</scala-bundle-version>
- <servicemix-specs-version>1.6.0</servicemix-specs-version>
<jaxws.api.version>2.2</jaxws.api.version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_2</serp-bundle-version>
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=1043538&r1=1043537&r2=1043538&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
Wed Dec 8 17:36:52 2010
@@ -503,8 +503,8 @@
</feature>
<feature name='camel-sip' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>wrap:mvn:http://repository.jboss.org/nexus/content/groups/public!javax.sip/jain-sip-api/${jain-api-version}</bundle>
-
<bundle>wrap:mvn:http://repository.jboss.org/nexus/content/groups/public!javax.sip/jain-sip-ri/${jain-sip-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2/${servicemix-specs-version}</bundle>
+
<bundle>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/${pom.version}</bundle>
</feature>
<feature name='camel-shiro' version='${pom.version}'>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1043538&r1=1043537&r2=1043538&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed
Dec 8 17:36:52 2010
@@ -506,8 +506,8 @@
</feature>
<feature name='camel-sip' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>wrap:mvn:http://repository.jboss.org/nexus/content/groups/public!javax.sip/jain-sip-api/${jain-api-version}</bundle>
-
<bundle>wrap:mvn:http://repository.jboss.org/nexus/content/groups/public!javax.sip/jain-sip-ri/${jain-sip-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2/${servicemix-specs-version}</bundle>
+
<bundle>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/${pom.version}</bundle>
</feature>
<feature name='camel-shiro' version='${pom.version}'>
