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 2015/04/10 09:12:00 UTC

[1/6] camel git commit: Align camel-linkedin component to use same Maven coord as all others do

Repository: camel
Updated Branches:
  refs/heads/master 3df714c3a -> 1a14e18a9


Align camel-linkedin component to use same Maven coord as all others do


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

Branch: refs/heads/master
Commit: 715dbb79b9612c323eae172be19acfd0009f071c
Parents: 3df714c
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 10 07:55:01 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 10 07:56:41 2015 +0200

----------------------------------------------------------------------
 apache-camel/pom.xml                                     |  4 ++--
 apache-camel/src/main/descriptors/common-bin.xml         |  4 ++--
 components/camel-linkedin/camel-linkedin-api/pom.xml     |  6 +++---
 .../camel-linkedin/camel-linkedin-component/pom.xml      |  6 +++---
 components/camel-linkedin/pom.xml                        | 11 ++++-------
 platforms/karaf/features/src/main/resources/features.xml |  4 ++--
 6 files changed, 16 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/715dbb79/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 14d8f46..7b21588 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -467,11 +467,11 @@
       <artifactId>camel-leveldb</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel.component.linkedin</groupId>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-linkedin-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel.component.linkedin</groupId>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-linkedin</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/715dbb79/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 69ae8ab..602755e 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -127,8 +127,8 @@
         <include>org.apache.camel:camel-kura</include>
         <include>org.apache.camel:camel-ldap</include>
         <include>org.apache.camel:camel-leveldb</include>
-        <include>org.apache.camel.component.linkedin:camel-linkedin-api</include>
-        <include>org.apache.camel.component.linkedin:camel-linkedin</include>
+        <include>org.apache.camel.camel-linkedin-api</include>
+        <include>org.apache.camel.camel-linkedin</include>
         <include>org.apache.camel:camel-lucene</include>
         <include>org.apache.camel:camel-metrics</include>
         <include>org.apache.camel:camel-mail</include>

http://git-wip-us.apache.org/repos/asf/camel/blob/715dbb79/components/camel-linkedin/camel-linkedin-api/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 96866a2..95b8ca2 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -20,14 +20,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.camel.component.linkedin</groupId>
+    <groupId>org.apache.camel</groupId>
     <artifactId>camel-linkedin-parent</artifactId>
     <version>2.16-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-linkedin-api</artifactId>
-  <name>Camel :: LinkedIn Component API</name>
-  <description>Camel API for LinkedIn</description>
+  <name>Camel :: LinkedIn :: API</name>
+  <description>Camel LinkedIn API</description>
   <packaging>bundle</packaging>
 
   <properties>

http://git-wip-us.apache.org/repos/asf/camel/blob/715dbb79/components/camel-linkedin/camel-linkedin-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml b/components/camel-linkedin/camel-linkedin-component/pom.xml
index 0da7572..f251cf9 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -20,15 +20,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.camel.component.linkedin</groupId>
+    <groupId>org.apache.camel</groupId>
     <artifactId>camel-linkedin-parent</artifactId>
     <version>2.16-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-linkedin</artifactId>
   <packaging>bundle</packaging>
-  <name>Camel :: LinkedIn Component</name>
-  <description>Camel Component for LinkedIn</description>
+  <name>Camel :: LinkedIn :: Component</name>
+  <description>Camel LinkedIn component</description>
 
   <properties>
     <schemeName>linkedin</schemeName>

http://git-wip-us.apache.org/repos/asf/camel/blob/715dbb79/components/camel-linkedin/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/pom.xml b/components/camel-linkedin/pom.xml
index 03aee01..50a94a1 100644
--- a/components/camel-linkedin/pom.xml
+++ b/components/camel-linkedin/pom.xml
@@ -25,17 +25,14 @@
     <version>2.16-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.camel.component.linkedin</groupId>
   <artifactId>camel-linkedin-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.16-SNAPSHOT</version>
-
-  <name>Camel :: LinkedIn Component Parent</name>
-  <description>Parent project for Camel {LinkedIn} Component</description>
+  <name>Camel :: LinkedIn :: Parent</name>
+  <description>Camel LinkedIn parent</description>
 
   <modules>
-    <module>camel-linkedin-component</module>
     <module>camel-linkedin-api</module>
+    <module>camel-linkedin-component</module>
   </modules>
 
   <profiles>
@@ -49,7 +46,7 @@
               <childDelegation>false</childDelegation>
               <useFile>true</useFile>
               <forkCount>1</forkCount>
-	      <reuseForks>true</reuseForks>
+	            <reuseForks>true</reuseForks>
               <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
               <excludes>
                 <exclude>**/*XXXTest.java</exclude>

http://git-wip-us.apache.org/repos/asf/camel/blob/715dbb79/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 c035f29..80e7944 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -918,8 +918,8 @@
     <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
     <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
     <bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.21</bundle>
-    <bundle>mvn:org.apache.camel.component.linkedin/camel-linkedin-api/${project.version}</bundle>
-    <bundle>mvn:org.apache.camel.component.linkedin/camel-linkedin/${project.version}</bundle>
+    <bundle>mvn:org.apache.camel.linkedin/camel-linkedin-api/${project.version}</bundle>
+    <bundle>mvn:org.apache.camel.linkedin/camel-linkedin/${project.version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>


[3/6] camel git commit: CAMEL-8614: Align mvn coordinate for Camel components for linkedin and olingo2

Posted by da...@apache.org.
CAMEL-8614: Align mvn coordinate for Camel components for linkedin and olingo2


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

Branch: refs/heads/master
Commit: 086d31acde72aba9f9180642465f6f2352346c99
Parents: 7b85fe9
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 10 08:11:50 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 10 08:11:50 2015 +0200

----------------------------------------------------------------------
 apache-camel/pom.xml                                     | 8 ++++++--
 apache-camel/src/main/descriptors/common-bin.xml         | 5 +++--
 parent/pom.xml                                           | 4 ++--
 platforms/karaf/features/src/main/resources/features.xml | 4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/086d31ac/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 7b21588..3f72593 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -539,11 +539,11 @@
       <artifactId>camel-ognl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel.component.olingo2</groupId>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-olingo2-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel.component.olingo2</groupId>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-olingo2</artifactId>
     </dependency>
     <dependency>
@@ -853,6 +853,10 @@
       <artifactId>camel-commands-core</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-commands-jolokia</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.camel.karaf</groupId>
       <artifactId>camel-karaf-commands</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/086d31ac/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 602755e..add72b8 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -146,8 +146,8 @@
         <include>org.apache.camel:camel-netty-http</include>
         <include>org.apache.camel:camel-netty4-http</include>
         <include>org.apache.camel:camel-ognl</include>
-        <include>org.apache.camel.component.olingo2:camel-olingo2-api</include>
-        <include>org.apache.camel.component.olingo2:camel-olingo2</include>
+        <include>org.apache.camel.camel-olingo2-api</include>
+        <include>org.apache.camel.camel-olingo2</include>
         <include>org.apache.camel:camel-openshift</include>
         <include>org.apache.camel:camel-optaplanner</include>
         <include>org.apache.camel:camel-paho</include>
@@ -224,6 +224,7 @@
         <include>org.apache.camel:camel-zookeeper</include>
         <include>org.apache.camel:camel-catalog</include>
         <include>org.apache.camel:camel-commands-core</include>
+        <include>org.apache.camel:camel-commands-jolokia</include>
         <include>org.apache.camel.karaf:camel-karaf-commands</include>
         <!-- this jar is mandatory -->
         <include>org.slf4j:slf4j-api</include>

http://git-wip-us.apache.org/repos/asf/camel/blob/086d31ac/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 630e057..820101e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1202,12 +1202,12 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.camel.component.olingo2</groupId>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-olingo2-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.camel.component.olingo2</groupId>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-olingo2</artifactId>
         <version>${project.version}</version>
       </dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/086d31ac/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 80e7944..044ea20 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1057,8 +1057,8 @@
     <bundle dependency='true'>mvn:org.apache.olingo/olingo-odata2-api/${olingo2-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.olingo-odata2-core/${olingo-odata2-core-bundle-version}</bundle>
     <bundle dependency='true'>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.camel.component.olingo2/camel-olingo2-api/${project.version}</bundle>
-    <bundle>mvn:org.apache.camel.component.olingo2/camel-olingo2/${project.version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.camel/camel-olingo2-api/${project.version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-olingo2/${project.version}</bundle>
   </feature>
   <feature name='camel-openshift' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>


[2/6] camel git commit: CAMEL-8614: Align mvn coordinate for Camel components for linkedin and olingo2

Posted by da...@apache.org.
CAMEL-8614: Align mvn coordinate for Camel components for linkedin and olingo2


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

Branch: refs/heads/master
Commit: 7b85fe9fd40a3c6e869f6582494ab0707471d01e
Parents: 715dbb7
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 10 08:07:53 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 10 08:07:53 2015 +0200

----------------------------------------------------------------------
 .../camel-linkedin/camel-linkedin-component/pom.xml    |  5 ++---
 components/camel-olingo2/camel-olingo2-api/pom.xml     |  6 +++---
 .../camel-olingo2/camel-olingo2-component/pom.xml      | 13 +++++--------
 components/camel-olingo2/pom.xml                       |  8 +++-----
 parent/pom.xml                                         |  4 ++--
 5 files changed, 15 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7b85fe9f/components/camel-linkedin/camel-linkedin-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml b/components/camel-linkedin/camel-linkedin-component/pom.xml
index f251cf9..0fa9954 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -46,9 +46,8 @@
       <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel.component.linkedin</groupId>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-linkedin-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <!-- Camel annotations in runtime scope to avoid compile errors in IDEs -->
@@ -61,7 +60,7 @@
 
     <!-- Component API javadoc in provided scope to read API signatures -->
     <dependency>
-      <groupId>org.apache.camel.component.linkedin</groupId>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-linkedin-api</artifactId>
       <version>${project.version}</version>
       <classifier>javadoc</classifier>

http://git-wip-us.apache.org/repos/asf/camel/blob/7b85fe9f/components/camel-olingo2/camel-olingo2-api/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index ec34cd4..056d2ef 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -20,14 +20,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.camel.component.olingo2</groupId>
+    <groupId>org.apache.camel</groupId>
     <artifactId>camel-olingo2-parent</artifactId>
     <version>2.16-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-olingo2-api</artifactId>
-  <name>Camel :: Olingo2 Component API</name>
-  <description>Camel API for Apache Olingo2</description>
+  <name>Camel :: Olingo2 :: API</name>
+  <description>Camel Olingo2 API</description>
   <packaging>bundle</packaging>
 
   <properties>

http://git-wip-us.apache.org/repos/asf/camel/blob/7b85fe9f/components/camel-olingo2/camel-olingo2-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index 27e1fda..e6bcb88 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -20,15 +20,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.camel.component.olingo2</groupId>
+    <groupId>org.apache.camel</groupId>
     <artifactId>camel-olingo2-parent</artifactId>
     <version>2.16-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-olingo2</artifactId>
   <packaging>bundle</packaging>
-  <name>Camel :: Olingo2 Component</name>
-  <description>Camel Component for Apache Olingo2</description>
+  <name>Camel :: Olingo2 :: Component</name>
+  <description>Camel Olingo2 component</description>
 
   <properties>
     <schemeName>olingo2</schemeName>
@@ -44,12 +44,10 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel.component.olingo2</groupId>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-olingo2-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
@@ -67,9 +65,8 @@
 
     <!-- Component API javadoc in provided scope to read API signatures -->
     <dependency>
-      <groupId>org.apache.camel.component.olingo2</groupId>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-olingo2-api</artifactId>
-      <version>${project.version}</version>
       <classifier>javadoc</classifier>
       <scope>provided</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/7b85fe9f/components/camel-olingo2/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/pom.xml b/components/camel-olingo2/pom.xml
index d1eb837..a6d0e20 100644
--- a/components/camel-olingo2/pom.xml
+++ b/components/camel-olingo2/pom.xml
@@ -25,12 +25,10 @@
     <version>2.16-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.camel.component.olingo2</groupId>
   <artifactId>camel-olingo2-parent</artifactId>
   <packaging>pom</packaging>
-
-  <name>Camel :: Olingo2 Component Parent</name>
-  <description>Parent project for Camel {Olingo2} Component</description>
+  <name>Camel :: Olingo2 :: Parent</name>
+  <description>Camel Olingo2 parent</description>
 
   <modules>
     <module>camel-olingo2-api</module>
@@ -48,7 +46,7 @@
               <childDelegation>false</childDelegation>
               <useFile>true</useFile>
               <forkCount>1</forkCount>
-	      <reuseForks>true</reuseForks>
+	            <reuseForks>true</reuseForks>
               <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
               <excludes>
                 <exclude>**/*XXXTest.java</exclude>

http://git-wip-us.apache.org/repos/asf/camel/blob/7b85fe9f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6aa5756..630e057 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1112,12 +1112,12 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.camel.component.linkedin</groupId>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-linkedin-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.camel.component.linkedin</groupId>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-linkedin</artifactId>
         <version>${project.version}</version>
       </dependency>


[5/6] camel git commit: Polished

Posted by da...@apache.org.
Polished


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

Branch: refs/heads/master
Commit: 792764dbb83649625850fed4b65960f336a02895
Parents: 7489cdd
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 10 09:06:21 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 10 09:06:21 2015 +0200

----------------------------------------------------------------------
 components/camel-google-calendar/pom.xml | 2 +-
 components/camel-google-mail/pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/792764db/components/camel-google-calendar/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml
index 0265295..320ec99 100644
--- a/components/camel-google-calendar/pom.xml
+++ b/components/camel-google-calendar/pom.xml
@@ -27,7 +27,7 @@
 
   <artifactId>camel-google-calendar</artifactId>
   <packaging>bundle</packaging>
-  <name>Camel :: GoogleCalendar Component</name>
+  <name>Camel :: GoogleCalendar</name>
   <description>Camel Component for GoogleCalendar</description>
 
   <properties>

http://git-wip-us.apache.org/repos/asf/camel/blob/792764db/components/camel-google-mail/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml
index 0f0f9af..ba3be61 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -27,7 +27,7 @@
 
   <artifactId>camel-google-mail</artifactId>
   <packaging>bundle</packaging>
-  <name>Camel :: GoogleMail Component</name>
+  <name>Camel :: GoogleMail</name>
   <description>Camel Component for GoogleMail</description>
 
   <properties>


[4/6] camel git commit: CAMEL-8614: Align mvn coordinate for Camel components for linkedin and olingo2

Posted by da...@apache.org.
CAMEL-8614: Align mvn coordinate for Camel components for linkedin and olingo2


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

Branch: refs/heads/master
Commit: 7489cdd2253e092292c5d0ca55edb3b2f6ce3744
Parents: 086d31a
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 10 08:15:51 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 10 08:15:51 2015 +0200

----------------------------------------------------------------------
 components/camel-olingo2/camel-olingo2-component/pom.xml | 1 +
 parent/pom.xml                                           | 5 +++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7489cdd2/components/camel-olingo2/camel-olingo2-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index e6bcb88..ed37f55 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -67,6 +67,7 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-olingo2-api</artifactId>
+      <version>${project.version}</version>
       <classifier>javadoc</classifier>
       <scope>provided</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/7489cdd2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 820101e..80159cc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1599,6 +1599,11 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-commands-jolokia</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.camel.karaf</groupId>
         <artifactId>camel-karaf-commands</artifactId>
         <version>${project.version}</version>


[6/6] camel git commit: CAMEL-8614: Align mvn coordinate for Camel components for linkedin and olingo2

Posted by da...@apache.org.
CAMEL-8614: Align mvn coordinate for Camel components for linkedin and olingo2


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

Branch: refs/heads/master
Commit: 1a14e18a99257af52b0451bf78d783e22abe341d
Parents: 792764d
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 10 09:14:45 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 10 09:14:45 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/1a14e18a/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 044ea20..5574112 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -918,8 +918,8 @@
     <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
     <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
     <bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.21</bundle>
-    <bundle>mvn:org.apache.camel.linkedin/camel-linkedin-api/${project.version}</bundle>
-    <bundle>mvn:org.apache.camel.linkedin/camel-linkedin/${project.version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-linkedin-api/${project.version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-linkedin/${project.version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>