Author: davsclaus
Date: Tue Dec 14 12:18:44 2010
New Revision: 1049060
URL: http://svn.apache.org/viewvc?rev=1049060&view=rev
Log:
CAMEL-3406: Using SMX bundle. Thanks to Jean for patch.
Modified:
camel/trunk/components/camel-ognl/pom.xml
camel/trunk/parent/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-ognl/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/pom.xml?rev=1049060&r1=1049059&r2=1049060&view=diff
==============================================================================
--- camel/trunk/components/camel-ognl/pom.xml (original)
+++ camel/trunk/components/camel-ognl/pom.xml Tue Dec 14 12:18:44 2010
@@ -34,14 +34,6 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.language.ognl.*</camel.osgi.export.pkg>
</properties>
-
- <repositories>
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle
Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
- </repositories>
<dependencies>
<dependency>
@@ -58,12 +50,11 @@
</exclusion>
</exclusions>
</dependency>
-
- <!-- using the javassist from spring osgi bundle repo -->
+
<dependency>
- <groupId>org.jboss.javassist</groupId>
- <artifactId>com.springsource.javassist</artifactId>
- <version>${javassist-version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <version>${javassist-bundle-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1049060&r1=1049059&r2=1049060&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Dec 14 12:18:44 2010
@@ -57,7 +57,7 @@
<derby-version>10.4.2.0</derby-version>
<dozer-version>5.3.1</dozer-version>
<easymock-version>2.5.2</easymock-version>
- <ehcache-bundle-version>1.6.2_1-SNAPSHOT</ehcache-bundle-version>
+ <ehcache-bundle-version>1.6.2_1</ehcache-bundle-version>
<flatpack-version>3.2.0_1</flatpack-version>
<ftpserver-version>1.0.5</ftpserver-version>
<fuse-commons-management-version>1.0</fuse-commons-management-version>
@@ -87,7 +87,7 @@
<jackson-version>1.6.0</jackson-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>
+ <javassist-bundle-version>3.9.0.GA_1</javassist-bundle-version>
<javax-mail-version>1.4.3</javax-mail-version>
<jaxen-version>1.1.1</jaxen-version>
<jdom-version>1.1</jdom-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=1049060&r1=1049059&r2=1049060&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
Tue Dec 14 12:18:44 2010
@@ -445,7 +445,7 @@
<feature name='camel-ognl' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-version}</bundle>
-
<bundle>mvn:http://repository.springsource.com/maven/bundles/external!org.jboss.javassist/com.springsource.javassist/${javassist-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ognl/${pom.version}</bundle>
</feature>
<feature name='camel-printer' 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=1049060&r1=1049059&r2=1049060&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Dec 14 12:18:44 2010
@@ -448,7 +448,7 @@
<feature name='camel-ognl' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-version}</bundle>
-
<bundle>mvn:http://repository.springsource.com/maven/bundles/external!org.jboss.javassist/com.springsource.javassist/${javassist-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ognl/${pom.version}</bundle>
</feature>
<feature name='camel-printer' version='${pom.version}'>
