You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/10/18 10:18:54 UTC
[2/7] camel git commit: CAMEL-9085 Create a
Camel-Kubernetes/Openshift v3 Component. Add Camel-Kubernetes to kit
CAMEL-9085 Create a Camel-Kubernetes/Openshift v3 Component. Add Camel-Kubernetes to kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/03d64843
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/03d64843
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/03d64843
Branch: refs/heads/master
Commit: 03d64843fe1acc7ae2f4a441cd38a16bcbfa378b
Parents: a452d0a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sat Oct 17 13:44:05 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Oct 18 09:33:00 2015 +0200
----------------------------------------------------------------------
apache-camel/pom.xml | 4 ++++
apache-camel/src/main/descriptors/common-bin.xml | 1 +
components/camel-kubernetes/pom.xml | 4 ++--
components/pom.xml | 1 +
parent/pom.xml | 7 +++++++
5 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/03d64843/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index c7d8632..11660fe 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -480,6 +480,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-kubernetes</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-kura</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/03d64843/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 3b7aa4b..205ceb3 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -132,6 +132,7 @@
<include>org.apache.camel:camel-kestrel</include>
<include>org.apache.camel:camel-krati</include>
<include>org.apache.camel:camel-kura</include>
+ <include>org.apache.camel:camel-kubernetes</include>
<include>org.apache.camel:camel-ldap</include>
<include>org.apache.camel:camel-leveldb</include>
<include>org.apache.camel:camel-linkedin-api</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/03d64843/components/camel-kubernetes/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index cc70793..681f67f 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -36,12 +36,12 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
- <version>1.3.52</version>
+ <version>${kubernetes-client-version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>openshift-client</artifactId>
- <version>1.3.52</version>
+ <version>${openshift-client-version}</version>
</dependency>
<!-- testing -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/03d64843/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 43159d6..8c0f342 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -152,6 +152,7 @@
<module>camel-kafka</module>
<module>camel-kestrel</module>
<module>camel-krati</module>
+ <module>camel-kubernetes</module>
<module>camel-kura</module>
<module>camel-ldap</module>
<module>camel-leveldb</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/03d64843/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 02a3ec7..d317b6d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -324,6 +324,7 @@
<karaf3-version>3.0.2</karaf3-version>
<kie-version>6.3.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
+ <kubernetes-client-version>1.3.52</kubernetes-client-version>
<kxml2-bundle-version>2.3.0_2</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
<!-- virtual dependency only used by Eclipse m2e -->
@@ -391,6 +392,7 @@
<openejb-version>4.7.2</openejb-version>
<openjpa-version>2.4.0</openjpa-version>
<openshift-java-client-version>2.7.0.Final</openshift-java-client-version>
+ <openshift-client-version>1.3.52</openshift-client-version>
<optaplanner-version>6.3.0.Final</optaplanner-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
<oscache-bundle-version>2.4_5</oscache-bundle-version>
@@ -1170,6 +1172,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-kubernetes</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-lucene</artifactId>
<version>${project.version}</version>
</dependency>