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 2019/04/06 09:59:02 UTC
[camel] 09/14: CAMEL-13380: camel-core - Move cloud out into
camel-cloud component. Woprk in progress
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch cloud2
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b45f7d85f53fb6befb99be8548c4c24ab34f02b3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Apr 5 17:42:21 2019 +0200
CAMEL-13380: camel-core - Move cloud out into camel-cloud component. Woprk in progress
---
components/camel-dns/pom.xml | 3 +--
components/camel-etcd/pom.xml | 3 +--
components/camel-http4/pom.xml | 5 ++---
components/camel-jetty-common/pom.xml | 6 +++---
components/camel-kubernetes/pom.xml | 3 +--
components/camel-netty4-http/pom.xml | 4 ++++
components/camel-ribbon/pom.xml | 3 +--
components/camel-service/pom.xml | 3 +--
components/camel-spring-boot/pom.xml | 4 ++++
9 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/components/camel-dns/pom.xml b/components/camel-dns/pom.xml
index 22e8805..b609249 100644
--- a/components/camel-dns/pom.xml
+++ b/components/camel-dns/pom.xml
@@ -34,10 +34,9 @@
<dependencies>
- <!-- requires camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>camel-cloud</artifactId>
</dependency>
<dependency>
<groupId>dnsjava</groupId>
diff --git a/components/camel-etcd/pom.xml b/components/camel-etcd/pom.xml
index f009e24..1cc81e1 100644
--- a/components/camel-etcd/pom.xml
+++ b/components/camel-etcd/pom.xml
@@ -38,10 +38,9 @@
<dependencies>
- <!-- requires camel-core due camel cloud -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>camel-cloud</artifactId>
</dependency>
<!-- etcd -->
diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml
index 7422b61..a1dfd1c 100644
--- a/components/camel-http4/pom.xml
+++ b/components/camel-http4/pom.xml
@@ -34,9 +34,8 @@
<description>Camel HTTP (Apache HttpClient 4.x) support</description>
<properties>
- <!-- CAMEL-7010 Now we move to HttpClient 4.3 API -->
<camel.osgi.import.before.defaults>
- org.apache.http.*;version="[4.3,5)"
+ org.apache.http.*;version="[4.5,5)"
</camel.osgi.import.before.defaults>
</properties>
@@ -44,7 +43,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
+ <artifactId>camel-cloud</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index c6a37a4..8b4b9f1 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -31,11 +31,11 @@
<packaging>jar</packaging>
<name>Camel :: Jetty :: Common</name>
- <description>Camel Jetty 8.x/9.x support</description>
+ <description>Camel Jetty 9.x support</description>
<properties>
<camel.osgi.import.before.defaults>
- org.eclipse.jetty.*;version="[9.3,10)",
+ org.eclipse.jetty.*;version="[9.4,10)",
javax.servlet.*;version="${servlet-version-range}"
</camel.osgi.import.before.defaults>
</properties>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
+ <artifactId>camel-cloud</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index ec85bd6..8fca3ec 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -36,10 +36,9 @@
</properties>
<dependencies>
- <!-- requires camel-core due camel cloud -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>camel-cloud</artifactId>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml
index 1867f2a..dd08d5b 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -46,6 +46,10 @@
<artifactId>camel-http-common</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cloud</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api-version}</version>
diff --git a/components/camel-ribbon/pom.xml b/components/camel-ribbon/pom.xml
index 611490b..8ce01f9 100644
--- a/components/camel-ribbon/pom.xml
+++ b/components/camel-ribbon/pom.xml
@@ -41,10 +41,9 @@
<dependencies>
- <!-- needs camel-core because of camel cloud -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>camel-cloud</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-service/pom.xml b/components/camel-service/pom.xml
index 4cf8608..6e96f8c 100644
--- a/components/camel-service/pom.xml
+++ b/components/camel-service/pom.xml
@@ -38,10 +38,9 @@
<dependencies>
- <!-- needs camel-core because of camel cloud -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>camel-cloud</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index 5a9acf1..1d19d7f 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -69,6 +69,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cloud</artifactId>
+ </dependency>
<!-- JMX is enabled by default -->
<dependency>
<groupId>org.apache.camel</groupId>