camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1454292 - in /camel/trunk: components/camel-neo4j/pom.xml components/camel-redis/pom.xml parent/pom.xml
Date Fri, 08 Mar 2013 08:56:23 GMT
Author: davsclaus
Date: Fri Mar  8 08:56:22 2013
New Revision: 1454292

URL: http://svn.apache.org/r1454292
Log:
Dependency upgrades and fixed OSGi imports

Modified:
    camel/trunk/components/camel-neo4j/pom.xml
    camel/trunk/components/camel-redis/pom.xml
    camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-neo4j/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-neo4j/pom.xml?rev=1454292&r1=1454291&r2=1454292&view=diff
==============================================================================
--- camel/trunk/components/camel-neo4j/pom.xml (original)
+++ camel/trunk/components/camel-neo4j/pom.xml Fri Mar  8 08:56:22 2013
@@ -32,6 +32,7 @@
 
   <properties>
     <camel.osgi.export.pkg>org.apache.camel.component.neo4j.*</camel.osgi.export.pkg>
+    <camel.osgi.import.before.defaults>org.springframework.data.*;version="[2.2,3)"</camel.osgi.import.before.defaults>
     <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=neo4j</camel.osgi.export.service>
   </properties>
 
@@ -91,6 +92,12 @@
       <version>${mockito-version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.specs</groupId>
+      <artifactId>org.apache.servicemix.specs.jsr303-api-1.0.0</artifactId>
+      <version>2.2.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: camel/trunk/components/camel-redis/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-redis/pom.xml?rev=1454292&r1=1454291&r2=1454292&view=diff
==============================================================================
--- camel/trunk/components/camel-redis/pom.xml (original)
+++ camel/trunk/components/camel-redis/pom.xml Fri Mar  8 08:56:22 2013
@@ -31,9 +31,8 @@
     <description>Camel Redis Component</description>
 
     <properties>
-        <camel.osgi.export.pkg>
-            org.apache.camel.component.redis.*
-        </camel.osgi.export.pkg>
+        <camel.osgi.export.pkg>org.apache.camel.component.redis.*</camel.osgi.export.pkg>
+        <camel.osgi.import.before.defaults>org.springframework.data.*;version="[1.0,2)"</camel.osgi.import.before.defaults>
         <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=redis</camel.osgi.export.service>
     </properties>
 

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1454292&r1=1454291&r2=1454292&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Mar  8 08:56:22 2013
@@ -336,11 +336,11 @@
     <solr-version>3.6.1</solr-version>
     <spring-batch-version>2.1.9.RELEASE</spring-batch-version>
     <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
-    <spring-data-redis-version>1.0.2.RELEASE</spring-data-redis-version>
+    <spring-data-redis-version>1.0.3.RELEASE</spring-data-redis-version>
     <spring-integration-version>2.2.2.RELEASE</spring-integration-version>
     <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
     <spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
-    <spring-neo4j-version>2.1.0.RELEASE</spring-neo4j-version>
+    <spring-neo4j-version>2.2.0.RELEASE</spring-neo4j-version>
     <spring-retry-version>1.0.2.RELEASE</spring-retry-version>
     <!-- CAMEL-5768 using spring3.1.x by default -->
     <spring-version-range>[3.1,3.3)</spring-version-range>



Mime
View raw message