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
The following commit(s) were added to refs/heads/main by this push:
new 5484d705312 camel-jbang - Export should include DSL
5484d705312 is described below
commit 5484d705312ae19d51c777e506732bfdf1899c4a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 17 09:45:12 2022 +0200
camel-jbang - Export should include DSL
---
.../camel/dsl/jbang/core/commands/BaseExport.java | 32 ++++++++++++++++++++++
.../main/download/MavenDependencyDownloader.java | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
index 22324345db4..83b3aec73aa 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
@@ -54,6 +54,8 @@ abstract class BaseExport extends CamelCommand {
"camel.jbang.classpathFiles"
};
+ private static final String KAMELETS_VERSION = "0.8.1";
+
@CommandLine.Option(names = { "--gav" }, description = "The Maven
group:artifact:version", required = true)
protected String gav;
@@ -143,6 +145,36 @@ abstract class BaseExport extends CamelCommand {
for (String d : deps.split(",")) {
answer.add(d.trim());
}
+ } else if (line.startsWith("camel.main.routesIncludePattern=")) {
+ String routes = StringHelper.after(line,
"camel.main.routesIncludePattern=");
+ for (String r : routes.split(",")) {
+ String ext = FileUtil.onlyExt(r, true);
+ if (ext != null) {
+ // java is moved into src/main/java and compiled
during build
+ // for the other DSLs we need to add dependencies
+ if ("groovy".equals(ext)) {
+
answer.add("mvn:org.apache.camel:camel-groovy-dsl");
+ } else if ("js".equals(ext)) {
+ answer.add("mvn:org.apache.camel:camel-js-dsl");
+ } else if ("jsh".equals(ext)) {
+ answer.add("mvn:org.apache.camel:camel-jsh-dsl");
+ } else if ("kts".equals(ext)) {
+
answer.add("mvn:org.apache.camel:camel-kotlin-dsl");
+ } else if ("xml".equals(ext)) {
+
answer.add("mvn:org.apache.camel:camel-xml-io-dsl");
+ } else if ("yaml".equals(ext)) {
+ answer.add("mvn:org.apache.camel:camel-yaml-dsl");
+ // is it a kamelet?
+ ext = FileUtil.onlyExt(r, false);
+ if ("kamelet.yaml".equals(ext)) {
+
answer.add("mvn:org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
+ }
+ }
+ }
+ }
+ } else if (line.startsWith("camel.component.kamelet.location=")) {
+ // include kamelet catalog if we use kamelets
+ answer.add("mvn:org.apache.camel.kamelets:camel-kamelets:" +
kameletsVersion);
}
}
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
index 79dee6c4886..7effa90c69c 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
@@ -127,7 +127,7 @@ public class MavenDependencyDownloader extends
ServiceSupport implements Depende
mavenRepos.addAll(Arrays.stream(repos.split(",")).collect(Collectors.toList()));
}
// include Apache snapshot to make it easy to use upcoming releases
- if ("org.apache.camel".equals(groupId) && version != null &&
version.contains("SNAPSHOT")) {
+ if ("org.apache.camel".equals(groupId) &&
version.contains("SNAPSHOT")) {
mavenRepos.add(APACHE_SNAPSHOT_REPO);
}
