You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/12/26 05:39:16 UTC

[1/2] git commit: CAMEL-7090 Added camel-jgroups feature

Updated Branches:
  refs/heads/master 20616cc21 -> cf11eb183


CAMEL-7090 Added camel-jgroups feature


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc3e936f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc3e936f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc3e936f

Branch: refs/heads/master
Commit: fc3e936feafd860d5f21ea2e3b519dd5b8a28a55
Parents: 20616cc
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Dec 26 11:45:27 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Dec 26 11:45:27 2013 +0800

----------------------------------------------------------------------
 platforms/karaf/features/src/main/resources/features.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/fc3e936f/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index ec254c1..fc6ccba 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -568,6 +568,11 @@
     <feature version='${project.version}'>camel-http</feature>
     <bundle>mvn:org.apache.camel/camel-jetty/${project.version}</bundle>
   </feature>
+  <feature name='camel-jgroups' version='${project.version}' resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-jgroups/${project.version}</bundle>
+    <bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-version}</bundle>
+  </feature>
   <feature name='camel-jibx' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-jibx/${project.version}</bundle>


[2/2] git commit: CAMEL-7090 Added camel-jgroups into release kit

Posted by ni...@apache.org.
CAMEL-7090 Added camel-jgroups into release kit


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cf11eb18
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cf11eb18
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cf11eb18

Branch: refs/heads/master
Commit: cf11eb18353ae94104f27563ac4254c29724c0ea
Parents: fc3e936
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Dec 26 12:38:55 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Dec 26 12:38:55 2013 +0800

----------------------------------------------------------------------
 apache-camel/pom.xml                             | 4 ++++
 apache-camel/src/main/descriptors/common-bin.xml | 1 +
 parent/pom.xml                                   | 5 +++++
 3 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cf11eb18/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 5d65635..5c087c4 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -285,6 +285,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jgroups</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-jibx</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/cf11eb18/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index f22feee..4752ed8 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -84,6 +84,7 @@
         <include>org.apache.camel:camel-jcr</include>
         <include>org.apache.camel:camel-jdbc</include>
         <include>org.apache.camel:camel-jetty</include>
+        <include>org.apache.camel:camel-jgroups</include>
         <include>org.apache.camel:camel-jibx</include>
         <include>org.apache.camel:camel-jing</include>
         <include>org.apache.camel:camel-jms</include>

http://git-wip-us.apache.org/repos/asf/camel/blob/cf11eb18/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9971e0f..9596c10 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -821,6 +821,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-jgroups</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-jibx</artifactId>
         <version>${project.version}</version>
       </dependency>