This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 465c5b303cdc227788ca8fafac43e8474e1b145a Author: Claus Ibsen <[email protected]> AuthorDate: Tue May 25 06:54:38 2021 +0200 CAMEL-16585: camel-kamelet - Main class to easily bootstrap Camel with Kamelets --- bom/camel-bom/pom.xml | 10 ----- .../apache/camel/catalog/docs/kamelet-main.adoc | 49 --------------------- core/camel-allcomponents/pom.xml | 4 -- .../modules/others/pages/kamelet-main.adoc | 51 ---------------------- {components => dsl}/camel-kamelet-main/pom.xml | 2 +- .../services/org/apache/camel/other.properties | 0 .../src/generated/resources/kamelet-main.json | 0 .../src/main/docs/kamelet-main.adoc | 0 .../apache/camel/main/DependencyDownloader.java | 0 .../camel/main/KameletDependencyDownloader.java | 0 .../java/org/apache/camel/main/KameletMain.java | 0 .../main/java/org/apache/camel/main/MavenGav.java | 0 dsl/pom.xml | 1 + parent/pom.xml | 16 +++---- tooling/pom.xml | 26 ----------- 15 files changed, 8 insertions(+), 151 deletions(-) diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml index d628467..9096c86 100644 --- a/bom/camel-bom/pom.xml +++ b/bom/camel-bom/pom.xml @@ -1169,11 +1169,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-kamelet-main</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-kamelet-reify</artifactId> <version>${project.version}</version> </dependency> @@ -1270,11 +1265,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-manual</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-master</artifactId> <version>${project.version}</version> </dependency> diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/kamelet-main.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/kamelet-main.adoc deleted file mode 100644 index 4e196d1..0000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/kamelet-main.adoc +++ /dev/null @@ -1,49 +0,0 @@ -[[kamelet-main-other]] -= Kamelet Main Component -:docTitle: Kamelet Main -:artifactId: camel-kamelet-main -:description: Main to run Kamelet standalone -:since: 3.11 -:supportLevel: Preview -include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/kamelet-main.adoc[opts=optional] - -*Since Camel {since}* - -A `main` class that is opinionated to boostrap and run Camel standalone with Kameleets for development and demo purposes. - -== Initial configuration - -The `KameletMain` is pre-configured with the following properties: - -[source,properties] ----- -camel.component.kamelet.location = classpath:/kamelets,github:apache:camel-kamelets -camel.main.routes-include-pattern = classpath:camel/* -camel.main.lightweight = true ----- - -These settings can be overridden by configuration in `application.properties`. - -== Automatic dependencies downloading - -The Kamelet Main can automatic download Kamelet YAML files from a remote location over http/https, and from github as well. - -The official Kameleets from the Apache Camel Kamelet Catalog is stored on github and they can be used out of the box as-is. - -For example a Camel route can be _coded_ in YAML which uses the Earthquake Kamelet from the catalog, as shown below: - -[source,yaml] ----- -- route: - from: "kamelet:earthquake-source" - steps: - - unmarshal: - json: {} - - log: "Earthquake with magnitude ${body[properties][mag]} at ${body[properties][place]}" ----- - -In this use-case the earthquake kamelet will be downloaded from github, and as well its required dependencies. - -You can find an example with this at -https://github.com/apache/camel-examples/tree/main/examples/kamelet-main[kamelet-main]. - diff --git a/core/camel-allcomponents/pom.xml b/core/camel-allcomponents/pom.xml index 287b971..f8bdfba 100644 --- a/core/camel-allcomponents/pom.xml +++ b/core/camel-allcomponents/pom.xml @@ -799,10 +799,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-kamelet-main</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-kamelet-reify</artifactId> </dependency> <dependency> diff --git a/docs/components/modules/others/pages/kamelet-main.adoc b/docs/components/modules/others/pages/kamelet-main.adoc deleted file mode 100644 index 66ca814..0000000 --- a/docs/components/modules/others/pages/kamelet-main.adoc +++ /dev/null @@ -1,51 +0,0 @@ -[[kamelet-main-other]] -= Kamelet Main Component -//THIS FILE IS COPIED: EDIT THE SOURCE FILE: -:page-source: components/camel-kamelet-main/src/main/docs/kamelet-main.adoc -:docTitle: Kamelet Main -:artifactId: camel-kamelet-main -:description: Main to run Kamelet standalone -:since: 3.11 -:supportLevel: Preview -include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/kamelet-main.adoc[opts=optional] - -*Since Camel {since}* - -A `main` class that is opinionated to boostrap and run Camel standalone with Kameleets for development and demo purposes. - -== Initial configuration - -The `KameletMain` is pre-configured with the following properties: - -[source,properties] ----- -camel.component.kamelet.location = classpath:/kamelets,github:apache:camel-kamelets -camel.main.routes-include-pattern = classpath:camel/* -camel.main.lightweight = true ----- - -These settings can be overridden by configuration in `application.properties`. - -== Automatic dependencies downloading - -The Kamelet Main can automatic download Kamelet YAML files from a remote location over http/https, and from github as well. - -The official Kameleets from the Apache Camel Kamelet Catalog is stored on github and they can be used out of the box as-is. - -For example a Camel route can be _coded_ in YAML which uses the Earthquake Kamelet from the catalog, as shown below: - -[source,yaml] ----- -- route: - from: "kamelet:earthquake-source" - steps: - - unmarshal: - json: {} - - log: "Earthquake with magnitude ${body[properties][mag]} at ${body[properties][place]}" ----- - -In this use-case the earthquake kamelet will be downloaded from github, and as well its required dependencies. - -You can find an example with this at -https://github.com/apache/camel-examples/tree/main/examples/kamelet-main[kamelet-main]. - diff --git a/components/camel-kamelet-main/pom.xml b/dsl/camel-kamelet-main/pom.xml similarity index 98% rename from components/camel-kamelet-main/pom.xml rename to dsl/camel-kamelet-main/pom.xml index 6fb2a3f..7aafb96 100644 --- a/components/camel-kamelet-main/pom.xml +++ b/dsl/camel-kamelet-main/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.camel</groupId> - <artifactId>components</artifactId> + <artifactId>dsl</artifactId> <version>3.11.0-SNAPSHOT</version> </parent> diff --git a/components/camel-kamelet-main/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-kamelet-main/src/generated/resources/META-INF/services/org/apache/camel/other.properties similarity index 100% rename from components/camel-kamelet-main/src/generated/resources/META-INF/services/org/apache/camel/other.properties rename to dsl/camel-kamelet-main/src/generated/resources/META-INF/services/org/apache/camel/other.properties diff --git a/components/camel-kamelet-main/src/generated/resources/kamelet-main.json b/dsl/camel-kamelet-main/src/generated/resources/kamelet-main.json similarity index 100% rename from components/camel-kamelet-main/src/generated/resources/kamelet-main.json rename to dsl/camel-kamelet-main/src/generated/resources/kamelet-main.json diff --git a/components/camel-kamelet-main/src/main/docs/kamelet-main.adoc b/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc similarity index 100% rename from components/camel-kamelet-main/src/main/docs/kamelet-main.adoc rename to dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc diff --git a/components/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloader.java similarity index 100% rename from components/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloader.java rename to dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloader.java diff --git a/components/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletDependencyDownloader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletDependencyDownloader.java similarity index 100% rename from components/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletDependencyDownloader.java rename to dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletDependencyDownloader.java diff --git a/components/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java similarity index 100% rename from components/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java rename to dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java diff --git a/components/camel-kamelet-main/src/main/java/org/apache/camel/main/MavenGav.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/MavenGav.java similarity index 100% rename from components/camel-kamelet-main/src/main/java/org/apache/camel/main/MavenGav.java rename to dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/MavenGav.java diff --git a/dsl/pom.xml b/dsl/pom.xml index efdd0cb..dd349bf 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -43,6 +43,7 @@ <module>camel-yaml-dsl</module> <module>camel-js-dsl</module> <module>camel-kotlin-dsl</module> + <module>camel-kamelet-main</module> </modules> <properties> diff --git a/parent/pom.xml b/parent/pom.xml index 0a64bd6..d3906ee 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1776,11 +1776,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-kamelet-main</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-kamelet-reify</artifactId> <version>${project.version}</version> </dependency> @@ -2767,6 +2762,11 @@ <artifactId>camel-groovy-dsl-common</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-kamelet-main</artifactId> + <version>${project.version}</version> + </dependency> <!-- camel catalog --> <dependency> @@ -2792,11 +2792,6 @@ <!-- camel misc --> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-manual</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.apache.camel.tests</groupId> <artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId> <version>${project.version}</version> @@ -2820,6 +2815,7 @@ <version>${project.version}</version> <type>test-jar</type> </dependency> + <!-- cassandra --> <dependency> <groupId>org.apache.cassandra</groupId> diff --git a/tooling/pom.xml b/tooling/pom.xml index 1beccc5..65ea446 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -56,30 +56,4 @@ </plugin> </plugins> </build> - <!-- profiles> - <profile> - <id>build.manual</id> - <modules> - <module>camel-manual</module> - </modules> - </profile> - <profile> - <id>assembly</id> - <modules> - <module>camel-manual</module> - </modules> - </profile> - <profile> - <id>deploy</id> - <modules> - <module>camel-manual</module> - </modules> - </profile> - <profile> - <id>apache-release</id> - <modules> - <module>camel-manual</module> - </modules> - </profile> - </profiles --> </project>
