camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1049067 - in /camel/trunk: components/camel-restlet/pom.xml parent/pom.xml platforms/karaf/features/src/main/resources/features-spring2.xml platforms/karaf/features/src/main/resources/features.xml
Date Tue, 14 Dec 2010 12:45:31 GMT
Author: davsclaus
Date: Tue Dec 14 12:45:30 2010
New Revision: 1049067

URL: http://svn.apache.org/viewvc?rev=1049067&view=rev
Log:
CAMEL-3407: Use SMX bundle. Thanks to Jean for patch.

Modified:
    camel/trunk/components/camel-restlet/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-restlet/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/pom.xml?rev=1049067&r1=1049066&r2=1049067&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/pom.xml (original)
+++ camel/trunk/components/camel-restlet/pom.xml Tue Dec 14 12:45:30 2010
@@ -53,16 +53,11 @@
     </dependency>
 
     <dependency>
-      <groupId>org.restlet</groupId>
-      <artifactId>org.restlet</artifactId>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.restlet</artifactId>
     </dependency>
 
     <!-- test artifacts -->
-    <dependency>
-      <groupId>com.noelios.restlet</groupId>
-      <artifactId>com.noelios.restlet</artifactId>      
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.camel</groupId>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1049067&r1=1049066&r2=1049067&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Dec 14 12:45:30 2010
@@ -115,7 +115,7 @@
     <qpid-version>0.5.0</qpid-version>
     <quartz-version>1.8.4</quartz-version>
     <quickfix-version>1.5.0</quickfix-version>
-    <restlet-version>1.1.10</restlet-version>
+    <restlet-bundle-version>1.1.10_1</restlet-bundle-version>
     <rome-version>1.0</rome-version>
     <saxon-version>9.1.0.8</saxon-version>
     <scala-version>2.8.0</scala-version>
@@ -1090,14 +1090,9 @@
       
       <!-- optional restlet support -->
       <dependency>
-        <groupId>org.restlet</groupId>
-        <artifactId>org.restlet</artifactId>
-        <version>${restlet-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.noelios.restlet</groupId>
-        <artifactId>com.noelios.restlet</artifactId>
-        <version>${restlet-version}</version>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.restlet</artifactId>
+        <version>${restlet-bundle-version}</version>
       </dependency>
 
       <!-- optional jakarta http core support -->

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=1049067&r1=1049066&r2=1049067&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:45:30 2010
@@ -474,9 +474,8 @@
   </feature>
   <feature name='camel-restlet' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.restlet/${restlet-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
-    <bundle>mvn:http://maven.restlet.org!org.restlet/org.restlet/${restlet-version}</bundle>
-    <bundle>mvn:http://maven.restlet.org!com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
   </feature>
   <feature name='camel-rmi' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</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=1049067&r1=1049066&r2=1049067&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:45:30
2010
@@ -477,9 +477,8 @@
   </feature>
   <feature name='camel-restlet' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.restlet/${restlet-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
-    <bundle>mvn:http://maven.restlet.org!org.restlet/org.restlet/${restlet-version}</bundle>
-    <bundle>mvn:http://maven.restlet.org!com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
   </feature>
   <feature name='camel-rmi' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>



Mime
View raw message