This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a1f310277d1df5187691575d3e2a43487e2d5bd3
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 7 14:09:09 2019 +0200
CAMEL-13620: Move Main out to camel-main
---
MIGRATION.md | 5 +++++
components/camel-pubnub/pom.xml | 5 +++++
core/camel-core/pom.xml | 8 --------
examples/camel-example-ftp/pom.xml | 4 ++++
examples/camel-example-hystrix/service2/pom.xml | 4 ++++
examples/camel-example-java8/pom.xml | 4 ++++
examples/camel-example-kotlin/pom.xml | 4 ++++
examples/camel-example-netty-custom-correlation/pom.xml | 4 ++++
examples/camel-example-opentracing/service2/pom.xml | 4 ++++
examples/camel-example-spark-rest/pom.xml | 4 ++++
examples/camel-example-splunk/pom.xml | 5 +++++
examples/camel-example-twitter-websocket/pom.xml | 4 ++++
examples/camel-example-zipkin/service2/pom.xml | 4 ++++
parent/pom.xml | 5 -----
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 +++++
15 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index a8e3279..79d9b12 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -22,6 +22,7 @@ In Camel 2.x camel-core was one JAR file, which now has been
splitup into many J
- camel-cloud
- camel-core
- camel-jaxp
+- camel-main
- camel-management-api
- camel-management-impl
- camel-support
@@ -82,6 +83,10 @@ All deprecated APIs and components from Camel 2.x has been
removed in Camel 3.
Migrating Camel applications
----------------------------
+### Main class
+
+The Camel `Main` class has been moved out of `camel-core` into `camel-main` so
you should add that as dependency if you use Main.
+
### Removed components
We have removed all deprecated components from Camel 2.x, also including the
old `camel-http` component. Instead you can use `camel-http4`.
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index 599d735..cf5ff29 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -55,6 +55,11 @@
<!-- logging -->
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>test</scope>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 4dad28c..118b999 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -542,10 +542,6 @@
<packages>org.apache.camel.impl:org.apache.camel.impl.*</packages>
</group>
<group>
- <title>Camel Main to run Camel standalone</title>
- <packages>org.apache.camel.main</packages>
- </group>
- <group>
<title>Type conversion helper classes</title>
<packages>org.apache.camel.converter:org.apache.camel.converter.*</packages>
</group>
@@ -627,10 +623,6 @@
<packages>org.apache.camel.impl:org.apache.camel.impl.*</packages>
</group>
<group>
- <title>Camel Main to run Camel
standalone</title>
- <packages>org.apache.camel.main</packages>
- </group>
- <group>
<title>Type conversion helper
classes</title>
<packages>org.apache.camel.converter:org.apache.camel.converter.*</packages>
</group>
diff --git a/examples/camel-example-ftp/pom.xml
b/examples/camel-example-ftp/pom.xml
index 9e879c3..0151925 100644
--- a/examples/camel-example-ftp/pom.xml
+++ b/examples/camel-example-ftp/pom.xml
@@ -46,6 +46,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-ftp</artifactId>
</dependency>
diff --git a/examples/camel-example-hystrix/service2/pom.xml
b/examples/camel-example-hystrix/service2/pom.xml
index bbcf709..2e70726 100644
--- a/examples/camel-example-hystrix/service2/pom.xml
+++ b/examples/camel-example-hystrix/service2/pom.xml
@@ -54,6 +54,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-hystrix</artifactId>
</dependency>
<dependency>
diff --git a/examples/camel-example-java8/pom.xml
b/examples/camel-example-java8/pom.xml
index 94bb91b..745eade 100644
--- a/examples/camel-example-java8/pom.xml
+++ b/examples/camel-example-java8/pom.xml
@@ -43,6 +43,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
<!-- logging -->
<dependency>
diff --git a/examples/camel-example-kotlin/pom.xml
b/examples/camel-example-kotlin/pom.xml
index c553eb5..b463c73 100644
--- a/examples/camel-example-kotlin/pom.xml
+++ b/examples/camel-example-kotlin/pom.xml
@@ -50,6 +50,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
<!-- used for jetty -->
<dependency>
diff --git a/examples/camel-example-netty-custom-correlation/pom.xml
b/examples/camel-example-netty-custom-correlation/pom.xml
index 1a773bd..ee12ffd 100644
--- a/examples/camel-example-netty-custom-correlation/pom.xml
+++ b/examples/camel-example-netty-custom-correlation/pom.xml
@@ -45,6 +45,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-netty4</artifactId>
</dependency>
diff --git a/examples/camel-example-opentracing/service2/pom.xml
b/examples/camel-example-opentracing/service2/pom.xml
index 0752ac0..39d57ca 100644
--- a/examples/camel-example-opentracing/service2/pom.xml
+++ b/examples/camel-example-opentracing/service2/pom.xml
@@ -59,6 +59,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-undertow</artifactId>
</dependency>
diff --git a/examples/camel-example-spark-rest/pom.xml
b/examples/camel-example-spark-rest/pom.xml
index 5499aa4..c48004b 100644
--- a/examples/camel-example-spark-rest/pom.xml
+++ b/examples/camel-example-spark-rest/pom.xml
@@ -46,6 +46,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-spark-rest</artifactId>
</dependency>
<dependency>
diff --git a/examples/camel-example-splunk/pom.xml
b/examples/camel-example-splunk/pom.xml
index 5b5632d..7053f45 100644
--- a/examples/camel-example-splunk/pom.xml
+++ b/examples/camel-example-splunk/pom.xml
@@ -45,6 +45,11 @@
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-splunk</artifactId>
</dependency>
diff --git a/examples/camel-example-twitter-websocket/pom.xml
b/examples/camel-example-twitter-websocket/pom.xml
index 0c02624..a7109c6 100644
--- a/examples/camel-example-twitter-websocket/pom.xml
+++ b/examples/camel-example-twitter-websocket/pom.xml
@@ -45,6 +45,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-twitter</artifactId>
</dependency>
<dependency>
diff --git a/examples/camel-example-zipkin/service2/pom.xml
b/examples/camel-example-zipkin/service2/pom.xml
index f1a1b10..0b905ce 100644
--- a/examples/camel-example-zipkin/service2/pom.xml
+++ b/examples/camel-example-zipkin/service2/pom.xml
@@ -54,6 +54,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-zipkin</artifactId>
</dependency>
<dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index bf11e75..f0647c0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2973,11 +2973,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-headersmap-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-hipchat-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 5bb47cd..d4f04b6 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2009,6 +2009,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-management-api</artifactId>
<version>${project.version}</version>
</dependency>
