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:02 UTC
[3/6] camel git commit: CAMEL-8614: Align mvn coordinate for Camel
components for linkedin and olingo2
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>