camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r814315 - in /camel/trunk: components/camel-cache/pom.xml parent/pom.xml platforms/karaf/features/src/main/resources/features.xml
Date Sun, 13 Sep 2009 14:10:11 GMT
Author: ningjiang
Date: Sun Sep 13 14:10:11 2009
New Revision: 814315

URL: http://svn.apache.org/viewvc?rev=814315&view=rev
Log:
CAMEL-2009 add camel-cache features file

Modified:
    camel/trunk/components/camel-cache/pom.xml
    camel/trunk/parent/pom.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=814315&r1=814314&r2=814315&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/pom.xml (original)
+++ camel/trunk/components/camel-cache/pom.xml Sun Sep 13 14:10:11 2009
@@ -37,13 +37,18 @@
     <camel.osgi.export.pkg>org.apache.camel.component.cache.*</camel.osgi.export.pkg>
   </properties>
 
-    <repositories>
-        <repository>
-            <id>servicemix</id>
-            <name>Apache ServiceMix Repository</name>
-            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
-        </repository>
-    </repositories>
+  <repositories>
+	<repository>
+		<id>servicemix</id>
+		<name>Apache ServiceMix Repository</name>
+		<url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+	</repository>
+	<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>
 
@@ -52,9 +57,8 @@
       <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.6.0</version>
+      <groupId>net.sourceforge.ehcache</groupId>
+      <artifactId>com.springsource.net.sf.ehcache</artifactId>
     </dependency>
     <dependency>
         <groupId>xalan</groupId>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=814315&r1=814314&r2=814315&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Sep 13 14:10:11 2009
@@ -79,6 +79,7 @@
     <saxon-version>9.1.0.1</saxon-version>
     <scala-version>2.7.3</scala-version>
     <scala-plugin-version>2.9.1</scala-plugin-version>
+    <spring-ehcache-version>1.6.2</spring-ehcache-version>
     <testng-version>5.8</testng-version>
     <xbean-spring-version>3.5</xbean-spring-version>
     <xstream-version>1.3.1</xstream-version>
@@ -873,6 +874,12 @@
         <version>${openjpa-version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>net.sourceforge.ehcache</groupId>
+        <artifactId>com.springsource.net.sf.ehcache</artifactId>
+        <version>${spring-ehcache-version}</version>
+      </dependency>
+
       <!-- hibernate and other db systems -->
       <dependency>
         <groupId>org.hibernate</groupId>

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=814315&r1=814314&r2=814315&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sun Sep 13 14:10:11
2009
@@ -71,7 +71,7 @@
   </feature>
   <feature name='camel-cache' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>
-    <bundle>mvn:net.sourceforge.ehcache/com.springsource.net.sf.ehcache/${spring.ehcache.version}</bundle>
+    <bundle>mvn:net.sourceforge.ehcache/com.springsource.net.sf.ehcache/${spring-ehcache-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>



Mime
View raw message