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/06/07 12:14:50 UTC
[camel] branch master updated (f9db44c -> a1f3102)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from f9db44c Make Dropbox tests more stable
new 24b804a Polished
new 5f3efad CAMEL-13620: Move Main out to camel-main
new dd76d6f CAMEL-13620: Move Main out to camel-main
new 0b09982 CAMEL-13620: Move Main out to camel-main
new a1f3102 CAMEL-13620: Move Main out to camel-main
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MIGRATION.md | 5 +
apache-camel/pom.xml | 17 +-
apache-camel/src/main/descriptors/common-bin.xml | 2 +-
bom/camel-bom/pom.xml | 5 +
components/camel-cdi/pom.xml | 4 +
components/camel-pubnub/pom.xml | 5 +
components/camel-spring/pom.xml | 4 +
components/camel-test-blueprint/pom.xml | 4 +
core/camel-core/pom.xml | 8 -
.../org/apache/camel/impl/DefaultCamelContext.java | 20 --
.../camel-stream => core/camel-main}/pom.xml | 16 +-
.../src/main/java/org/apache/camel/main/Main.java | 0
.../camel/main/MainConfigurationProperties.java | 0
.../camel/main/MainDurationEventNotifier.java | 0
.../apache/camel/main/MainLifecycleStrategy.java | 0
.../java/org/apache/camel/main/MainListener.java | 0
.../org/apache/camel/main/MainListenerSupport.java | 0
.../java/org/apache/camel/main/MainRegistry.java | 0
.../java/org/apache/camel/main/MainSupport.java | 0
.../main/java/org/apache/camel/main/package.html | 0
.../java/org/apache/camel/main/MainExample.java | 0
.../main/MainIoCNewRouteBuilderComplexTest.java | 1 -
.../camel/main/MainIoCNewRouteBuilderTest.java | 0
.../java/org/apache/camel/main/MainIoCTest.java | 0
.../camel/main/MainSupportCommandLineTest.java} | 9 +-
.../test/java/org/apache/camel/main/MainTest.java | 0
.../java/org/apache/camel/main/MainVetoTest.java | 0
.../test/java/org/apache/camel/main}/MyFoo.java | 2 +-
.../src/test/resources/application.properties | 0
.../src/test/resources/log4j2.properties | 4 +-
core/pom.xml | 1 +
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-main/pom.xml | 4 +
.../camel-example-netty-custom-correlation/pom.xml | 4 +
.../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 | 10 +-
.../karaf/features/src/main/resources/features.xml | 1 +
.../camel-headersmap-starter/pom.xml | 53 ------
.../src/main/resources/META-INF/LICENSE.txt | 203 ---------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
.../src/main/resources/META-INF/spring.provides | 17 --
platforms/spring-boot/components-starter/pom.xml | 1 -
.../camel-spring-boot-dependencies/pom.xml | 5 +
50 files changed, 114 insertions(+), 339 deletions(-)
copy {components/camel-stream => core/camel-main}/pom.xml (88%)
rename core/{camel-core => camel-main}/src/main/java/org/apache/camel/main/Main.java (100%)
rename core/{camel-core => camel-main}/src/main/java/org/apache/camel/main/MainConfigurationProperties.java (100%)
rename core/{camel-core => camel-main}/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java (100%)
rename core/{camel-core => camel-main}/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java (100%)
rename core/{camel-core => camel-main}/src/main/java/org/apache/camel/main/MainListener.java (100%)
rename core/{camel-core => camel-main}/src/main/java/org/apache/camel/main/MainListenerSupport.java (100%)
rename core/{camel-core => camel-main}/src/main/java/org/apache/camel/main/MainRegistry.java (100%)
rename core/{camel-core => camel-main}/src/main/java/org/apache/camel/main/MainSupport.java (100%)
rename core/{camel-core => camel-main}/src/main/java/org/apache/camel/main/package.html (100%)
rename core/{camel-core => camel-main}/src/test/java/org/apache/camel/main/MainExample.java (100%)
rename core/{camel-core => camel-main}/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java (98%)
rename core/{camel-core => camel-main}/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java (100%)
rename core/{camel-core => camel-main}/src/test/java/org/apache/camel/main/MainIoCTest.java (100%)
rename core/{camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java => camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java} (90%)
rename core/{camel-core => camel-main}/src/test/java/org/apache/camel/main/MainTest.java (100%)
rename core/{camel-core => camel-main}/src/test/java/org/apache/camel/main/MainVetoTest.java (100%)
copy core/{camel-core/src/test/java/org/apache/camel => camel-main/src/test/java/org/apache/camel/main}/MyFoo.java (97%)
copy core/{camel-core => camel-main}/src/test/resources/application.properties (100%)
copy core/{camel-cloud => camel-main}/src/test/resources/log4j2.properties (91%)
delete mode 100644 platforms/spring-boot/components-starter/camel-headersmap-starter/pom.xml
delete mode 100644 platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/LICENSE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/NOTICE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/spring.provides
[camel] 03/05: CAMEL-13620: Move Main out to camel-main
Posted by da...@apache.org.
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 dd76d6f9beda3867c1fe4253c906f760aa1fa78c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 7 12:56:29 2019 +0200
CAMEL-13620: Move Main out to camel-main
---
apache-camel/pom.xml | 17 +-
apache-camel/src/main/descriptors/common-bin.xml | 2 +-
components/camel-cdi/pom.xml | 4 +
components/camel-spring/pom.xml | 4 +
.../src/test/resources/log4j2.properties | 20 +-
parent/pom.xml | 5 +
.../karaf/features/src/main/resources/features.xml | 1 +
.../camel-headersmap-starter/pom.xml | 53 ------
.../src/main/resources/META-INF/LICENSE.txt | 203 ---------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
platforms/spring-boot/components-starter/pom.xml | 1 -
11 files changed, 46 insertions(+), 275 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index badecbc..7de3b89 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -88,6 +88,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-cloud</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-headersmap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-caffeine-lrucache</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
<!-- NOTE: auto-generated list of components when building camel catalog -->
<!-- camel components: START -->
@@ -2162,11 +2174,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/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index cda385a..f40548a 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -37,6 +37,7 @@
<include>org.apache.camel:camel-core-osgi</include>
<include>org.apache.camel:camel-core-xml</include>
<include>org.apache.camel:camel-cloud</include>
+ <include>org.apache.camel:camel-main</include>
<!-- NOTE: auto-generated list of components when building camel catalog -->
<!-- camel components: START -->
@@ -492,7 +493,6 @@
<include>org.apache.camel:camel-hazelcast-starter</include>
<include>org.apache.camel:camel-hbase-starter</include>
<include>org.apache.camel:camel-hdfs2-starter</include>
- <include>org.apache.camel:camel-headersmap-starter</include>
<include>org.apache.camel:camel-hipchat-starter</include>
<include>org.apache.camel:camel-hl7-starter</include>
<include>org.apache.camel:camel-http-common-starter</include>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index fb43ce1..217adea 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -80,6 +80,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
<!-- DeltaSpike is only used to provide Main support thus optional -->
<dependency>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 2a873b7..91f2c9e 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -40,6 +40,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-management-api</artifactId>
</dependency>
<dependency>
diff --git a/platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/spring.provides b/core/camel-main/src/test/resources/log4j2.properties
similarity index 60%
rename from platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/spring.provides
rename to core/camel-main/src/test/resources/log4j2.properties
index e65a6c9..453675d 100644
--- a/platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/spring.provides
+++ b/core/camel-main/src/test/resources/log4j2.properties
@@ -14,4 +14,22 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-provides: camel-headersmap
+appender.console.type = Console
+appender.console.name = console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-main-test.log
+appender.file.append = true
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+rootLogger.level = INFO
+
+rootLogger.appenderRef.file.ref = file
+#rootLogger.appenderRef.console.ref = console
+
+#logger.camel-core.name = org.apache.camel
+#logger.camel-core.level = TRACE
diff --git a/parent/pom.xml b/parent/pom.xml
index c49c598..bf11e75 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -844,6 +844,11 @@
<artifactId>camel-headersmap</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- NOTE: auto-generated list of components when building camel catalog -->
<!-- camel components: START -->
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index c7c5edc..ea98587 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -56,6 +56,7 @@
<bundle>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cloud/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-jaxp/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-main/${project.version}</bundle>
<!-- core components -->
<bundle>mvn:org.apache.camel/camel-bean/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-browse/${project.version}</bundle>
diff --git a/platforms/spring-boot/components-starter/camel-headersmap-starter/pom.xml b/platforms/spring-boot/components-starter/camel-headersmap-starter/pom.xml
deleted file mode 100644
index 8493f7c..0000000
--- a/platforms/spring-boot/components-starter/camel-headersmap-starter/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components-starter</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-headersmap-starter</artifactId>
- <packaging>jar</packaging>
- <name>Spring-Boot Starter :: Camel :: Headers Map</name>
- <description>Spring-Boot Starter for Fast case-insensitive headers map implementation</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-headersmap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git a/platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/platforms/spring-boot/components-starter/camel-headersmap-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index c8f3397..de0cf7c 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -210,7 +210,6 @@
<module>camel-hazelcast-starter</module>
<module>camel-hbase-starter</module>
<module>camel-hdfs2-starter</module>
- <module>camel-headersmap-starter</module>
<module>camel-hipchat-starter</module>
<module>camel-hl7-starter</module>
<module>camel-http-common-starter</module>
[camel] 02/05: CAMEL-13620: Move Main out to camel-main
Posted by da...@apache.org.
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 5f3efadaa0ec4a1e652095506eb3e4617a7ddab3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 7 12:46:36 2019 +0200
CAMEL-13620: Move Main out to camel-main
---
.../camel-example-main => core/camel-main}/pom.xml | 48 ++++++++--------------
.../src/main/java/org/apache/camel/main/Main.java | 0
.../camel/main/MainConfigurationProperties.java | 0
.../camel/main/MainDurationEventNotifier.java | 0
.../apache/camel/main/MainLifecycleStrategy.java | 0
.../java/org/apache/camel/main/MainListener.java | 0
.../org/apache/camel/main/MainListenerSupport.java | 0
.../java/org/apache/camel/main/MainRegistry.java | 0
.../java/org/apache/camel/main/MainSupport.java | 0
.../main/java/org/apache/camel/main/package.html | 0
.../java/org/apache/camel/main/MainExample.java | 0
.../main/MainIoCNewRouteBuilderComplexTest.java | 1 -
.../camel/main/MainIoCNewRouteBuilderTest.java | 0
.../java/org/apache/camel/main/MainIoCTest.java | 0
.../camel/main/MainSupportCommandLineTest.java} | 9 ++--
.../test/java/org/apache/camel/main/MainTest.java | 0
.../java/org/apache/camel/main/MainVetoTest.java | 0
.../test/java/org/apache/camel/main/MyFoo.java} | 19 ++++++---
.../src/test/resources/application.properties | 21 ++++++++++
core/pom.xml | 1 +
examples/camel-example-main/pom.xml | 4 ++
21 files changed, 62 insertions(+), 41 deletions(-)
diff --git a/examples/camel-example-main/pom.xml b/core/camel-main/pom.xml
similarity index 64%
copy from examples/camel-example-main/pom.xml
copy to core/camel-main/pom.xml
index 9f75dcc..54659cf 100644
--- a/examples/camel-example-main/pom.xml
+++ b/core/camel-main/pom.xml
@@ -19,22 +19,22 @@
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.camel.example</groupId>
- <artifactId>examples</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>core</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-example-main</artifactId>
+ <artifactId>camel-main</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Example :: Main</name>
- <description>An example for showing standalone Camel</description>
+ <name>Camel :: Main</name>
+ <description>Camel Main</description>
<properties>
- <category>Beginner</category>
+ <firstVersion>3.0</firstVersion>
+ <label>core</label>
</properties>
<dependencies>
@@ -43,47 +43,33 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
+
+ <!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-quartz2</artifactId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
</dependency>
-
- <!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- <scope>runtime</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
-
</dependencies>
- <build>
- <plugins>
- <!-- Allows the example to be run via 'mvn camel:run' -->
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <mainClass>org.apache.camel.example.MyApplication</mainClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/Main.java b/core/camel-main/src/main/java/org/apache/camel/main/Main.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/Main.java
rename to core/camel-main/src/main/java/org/apache/camel/main/Main.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/MainConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
rename to core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java b/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
rename to core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java b/core/camel-main/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java
rename to core/camel-main/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/MainListener.java b/core/camel-main/src/main/java/org/apache/camel/main/MainListener.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/MainListener.java
rename to core/camel-main/src/main/java/org/apache/camel/main/MainListener.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/MainListenerSupport.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java
rename to core/camel-main/src/main/java/org/apache/camel/main/MainListenerSupport.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/MainRegistry.java b/core/camel-main/src/main/java/org/apache/camel/main/MainRegistry.java
similarity index 100%
copy from core/camel-core/src/main/java/org/apache/camel/main/MainRegistry.java
copy to core/camel-main/src/main/java/org/apache/camel/main/MainRegistry.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
rename to core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/package.html b/core/camel-main/src/main/java/org/apache/camel/main/package.html
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/package.html
rename to core/camel-main/src/main/java/org/apache/camel/main/package.html
diff --git a/core/camel-core/src/test/java/org/apache/camel/main/MainExample.java b/core/camel-main/src/test/java/org/apache/camel/main/MainExample.java
similarity index 100%
rename from core/camel-core/src/test/java/org/apache/camel/main/MainExample.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainExample.java
diff --git a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
similarity index 98%
rename from core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
index 01a90db..a7304d6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.main;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
-import org.apache.camel.MyFoo;
import org.apache.camel.PropertyInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
similarity index 100%
rename from core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
diff --git a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
similarity index 100%
rename from core/camel-core/src/test/java/org/apache/camel/main/MainIoCTest.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java
similarity index 90%
rename from core/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java
index 1e9ba7d..78449e9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java
@@ -14,18 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl;
+package org.apache.camel.main;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.main.MainSupport;
+import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Test;
-public class MainSupportTest extends ContextTestSupport {
+public class MainSupportCommandLineTest {
private class MyMainSupport extends MainSupport {
+ private CamelContext context = new DefaultCamelContext();
+
@Override
protected ProducerTemplate findOrCreateCamelTemplate() {
return context.createProducerTemplate();
diff --git a/core/camel-core/src/test/java/org/apache/camel/main/MainTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
similarity index 100%
rename from core/camel-core/src/test/java/org/apache/camel/main/MainTest.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
diff --git a/core/camel-core/src/test/java/org/apache/camel/main/MainVetoTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainVetoTest.java
similarity index 100%
rename from core/camel-core/src/test/java/org/apache/camel/main/MainVetoTest.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainVetoTest.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/MainRegistry.java b/core/camel-main/src/test/java/org/apache/camel/main/MyFoo.java
similarity index 76%
rename from core/camel-core/src/main/java/org/apache/camel/main/MainRegistry.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MyFoo.java
index 7eb8281..c612071 100644
--- a/core/camel-core/src/main/java/org/apache/camel/main/MainRegistry.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MyFoo.java
@@ -16,13 +16,22 @@
*/
package org.apache.camel.main;
-import java.util.Set;
+public class MyFoo {
-import org.apache.camel.support.DefaultRegistry;
+ private String name;
-public final class MainRegistry extends DefaultRegistry {
+ public MyFoo() {
+ }
+
+ public MyFoo(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
- public <T> Set<T> findBindingsByType(Class<T> type) {
- return fallbackRegistry.findByType(type);
+ public void setName(String name) {
+ this.name = name;
}
}
diff --git a/core/camel-main/src/test/resources/application.properties b/core/camel-main/src/test/resources/application.properties
new file mode 100644
index 0000000..8d8fba7
--- /dev/null
+++ b/core/camel-main/src/test/resources/application.properties
@@ -0,0 +1,21 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+hello=World
+
+camel.component.seda.concurrent-consumers=2
+camel.component.seda.queueSize=500
+camel.component.direct.timeout=1234
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 08b85a7..3f44b11 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -48,6 +48,7 @@
<module>camel-core-osgi</module>
<module>camel-core-xml</module>
<module>camel-cloud</module>
+ <module>camel-main</module>
</modules>
<build>
diff --git a/examples/camel-example-main/pom.xml b/examples/camel-example-main/pom.xml
index 9f75dcc..2d05078 100644
--- a/examples/camel-example-main/pom.xml
+++ b/examples/camel-example-main/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-quartz2</artifactId>
</dependency>
[camel] 01/05: Polished
Posted by da...@apache.org.
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 24b804aee6311cfc4bd83b3de345a9e9cdce3aea
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 7 12:28:42 2019 +0200
Polished
---
.../org/apache/camel/impl/DefaultCamelContext.java | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 1f4e396..6b7ac7e 100644
--- a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -149,17 +149,12 @@ public class DefaultCamelContext extends AbstractModelCamelContext {
super(init);
}
- /**
- * Lazily create a default implementation
- */
protected TypeConverter createTypeConverter() {
- // lets use the new fast type converter registry
return new DefaultTypeConverter(
this, getPackageScanClassResolver(),
getInjector(), getDefaultFactoryFinder(), isLoadTypeConverters());
}
- @Override
protected TypeConverterRegistry createTypeConverterRegistry() {
TypeConverter typeConverter = getTypeConverter();
if (typeConverter instanceof TypeConverterRegistry) {
@@ -168,9 +163,6 @@ public class DefaultCamelContext extends AbstractModelCamelContext {
return null;
}
- /**
- * Lazily create a default implementation
- */
protected Injector createInjector() {
FactoryFinder finder = getDefaultFactoryFinder();
try {
@@ -181,23 +173,14 @@ public class DefaultCamelContext extends AbstractModelCamelContext {
}
}
- /**
- * Lazily create a default bean post processor
- */
protected CamelBeanPostProcessor createBeanPostProcessor() {
return new DefaultCamelBeanPostProcessor(this);
}
- /**
- * Lazily create a default implementation
- */
protected ComponentResolver createComponentResolver() {
return new DefaultComponentResolver();
}
- /**
- * Lazily create a default implementation
- */
protected Registry createRegistry() {
return new DefaultRegistry();
}
@@ -250,7 +233,6 @@ public class DefaultCamelContext extends AbstractModelCamelContext {
return new DefaultHealthCheckRegistry(this);
}
-
protected ShutdownStrategy createShutdownStrategy() {
return new DefaultShutdownStrategy(this);
}
@@ -311,7 +293,6 @@ public class DefaultCamelContext extends AbstractModelCamelContext {
return new DefaultLanguageResolver();
}
- @Override
protected RestRegistryFactory createRestRegistryFactory() {
return new RestRegistryFactoryResolver().resolve(this);
}
@@ -320,7 +301,6 @@ public class DefaultCamelContext extends AbstractModelCamelContext {
return new DefaultEndpointRegistry(this, endpoints);
}
- @Override
protected StreamCachingStrategy createStreamCachingStrategy() {
return new DefaultStreamCachingStrategy();
}
[camel] 05/05: CAMEL-13620: Move Main out to camel-main
Posted by da...@apache.org.
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 <cl...@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>
[camel] 04/05: CAMEL-13620: Move Main out to camel-main
Posted by da...@apache.org.
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 0b09982bf588232d7a4f6f148f08c5437697b217
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 7 13:22:08 2019 +0200
CAMEL-13620: Move Main out to camel-main
---
bom/camel-bom/pom.xml | 5 +++++
components/camel-test-blueprint/pom.xml | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 39961eb..b690422 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1789,6 +1789,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>
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index d15fa4b..a1ce779 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/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-core</artifactId>
<type>test-jar</type>
<scope>test</scope>