You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/09 14:47:45 UTC

svn commit: r1229149 - in /camel/trunk: apache-camel/pom.xml apache-camel/src/main/descriptors/common-bin.xml parent/pom.xml

Author: davsclaus
Date: Mon Jan  9 13:47:44 2012
New Revision: 1229149

URL: http://svn.apache.org/viewvc?rev=1229149&view=rev
Log:
CAMEL-4498: Added camel-websocket to distribution

Modified:
    camel/trunk/apache-camel/pom.xml
    camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
    camel/trunk/parent/pom.xml

Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1229149&r1=1229148&r2=1229149&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Mon Jan  9 13:47:44 2012
@@ -451,10 +451,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-twitter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>
     </dependency>    
     <dependency>
@@ -463,10 +459,18 @@
     </dependency>    
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-twitter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-velocity</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-websocket</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-xmlbeans</artifactId>
     </dependency>
     <dependency>

Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1229149&r1=1229148&r2=1229149&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Mon Jan  9 13:47:44 2012
@@ -131,9 +131,9 @@
         <include>org.apache.camel:camel-stream</include>
         <include>org.apache.camel:camel-stringtemplate</include>
         <include>org.apache.camel:camel-syslog</include>
+        <include>org.apache.camel:camel-tagsoup</include>
         <include>org.apache.camel:camel-test</include>
         <include>org.apache.camel:camel-testng</include>
-        <include>org.apache.camel:camel-tagsoup</include>
         <include>org.apache.camel:camel-twitter</include>
         <include>org.apache.camel:camel-velocity</include>
         <include>org.apache.camel:camel-websocket</include>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1229149&r1=1229148&r2=1229149&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Jan  9 13:47:44 2012
@@ -737,17 +737,17 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-twitter</artifactId>
+        <artifactId>camel-test</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-test</artifactId>
+        <artifactId>camel-testng</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-testng</artifactId>
+        <artifactId>camel-twitter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -757,6 +757,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-websocket</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-xmlbeans</artifactId>
         <version>${project.version}</version>
       </dependency>