Author: hadrian
Date: Mon Nov 29 16:12:00 2010
New Revision: 1040167
URL: http://svn.apache.org/viewvc?rev=1040167&view=rev
Log:
CAMEL-3370. Patch applied with thanks to Jean Baptiste
Modified:
camel/trunk/components/camel-cache/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-cache/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/pom.xml?rev=1040167&r1=1040166&r2=1040167&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/pom.xml (original)
+++ camel/trunk/components/camel-cache/pom.xml Mon Nov 29 16:12:00 2010
@@ -39,14 +39,6 @@
</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>
@@ -54,8 +46,8 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>net.sourceforge.ehcache</groupId>
- <artifactId>com.springsource.net.sf.ehcache</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ehcache</artifactId>
</dependency>
<dependency>
<groupId>xalan</groupId>
@@ -72,7 +64,6 @@
<artifactId>commons-logging-api</artifactId>
</dependency>
-
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1040167&r1=1040166&r2=1040167&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Nov 29 16:12:00 2010
@@ -57,6 +57,7 @@
<derby-version>10.4.2.0</derby-version>
<dozer-version>5.3.0</dozer-version>
<easymock-version>2.5.2</easymock-version>
+ <ehcache-bundle-version>1.6.2_1-SNAPSHOT</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>
@@ -125,7 +126,6 @@
<smack-version>3.1.0</smack-version>
<snmp4j-version>1.8.1_3</snmp4j-version>
<smpp-version>2.1.0_1</smpp-version>
- <spring-ehcache-version>1.6.2</spring-ehcache-version>
<spring-integration-version>1.0.4.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-version>3.0.5.RELEASE</spring-version>
@@ -1244,9 +1244,9 @@
</dependency>
<dependency>
- <groupId>net.sourceforge.ehcache</groupId>
- <artifactId>com.springsource.net.sf.ehcache</artifactId>
- <version>${spring-ehcache-version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ehcache</artifactId>
+ <version>${ehcache-bundle-version}</version>
</dependency>
<!-- hibernate and other db systems -->
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=1040167&r1=1040166&r2=1040167&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
Mon Nov 29 16:12:00 2010
@@ -124,7 +124,7 @@
</feature>
<feature name='camel-cache' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:http://repository.springsource.com/maven/bundles/external!net.sourceforge.ehcache/com.springsource.net.sf.ehcache/${spring-ehcache-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-cache/${pom.version}</bundle>
</feature>
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=1040167&r1=1040166&r2=1040167&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon
Nov 29 16:12:00 2010
@@ -127,7 +127,7 @@
</feature>
<feature name='camel-cache' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:http://repository.springsource.com/maven/bundles/external!net.sourceforge.ehcache/com.springsource.net.sf.ehcache/${spring-ehcache-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-cache/${pom.version}</bundle>
</feature>
