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 2024/09/27 11:12:45 UTC
(camel) branch kam-exp created (now 1a7057a467f)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch kam-exp
in repository https://gitbox.apache.org/repos/asf/camel.git
at 1a7057a467f CAMEL-21279: camel-jbang - Export with kamelets should only include correct dependencies. Also custom kamelet files should be moved into kamelets folder instead of camel.
This branch includes the following new commits:
new 1a7057a467f CAMEL-21279: camel-jbang - Export with kamelets should only include correct dependencies. Also custom kamelet files should be moved into kamelets folder instead of camel.
The 1 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.
(camel) 01/01: CAMEL-21279: camel-jbang - Export with kamelets should only include correct dependencies. Also custom kamelet files should be moved into kamelets folder instead of camel.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch kam-exp
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1a7057a467f73f46c6ba8f333b53aade7344aab1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 27 13:04:57 2024 +0200
CAMEL-21279: camel-jbang - Export with kamelets should only include correct dependencies. Also custom kamelet files should be moved into kamelets folder instead of camel.
---
.../dsl/jbang/core/commands/ExportBaseCommand.java | 66 ++++++++++++-----
.../dsl/jbang/core/commands/ExportCamelMain.java | 14 ++--
.../dsl/jbang/core/commands/ExportQuarkus.java | 2 -
.../dsl/jbang/core/commands/ExportSpringBoot.java | 5 +-
.../camel/dsl/jbang/core/commands/ExportTest.java | 84 +++++++++++++++++++++-
.../test/resources/{route.yaml => counter.yaml} | 15 ++--
.../camel-jbang-core/src/test/resources/route.yaml | 12 ++--
.../src/test/resources/user-source.kamelet.yaml | 55 ++++++++++++++
.../download/DependencyDownloaderRoutesLoader.java | 4 --
9 files changed, 208 insertions(+), 49 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 8d3540f4d75..03db7e8041d 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -368,7 +368,12 @@ public abstract class ExportBaseCommand extends CamelCommand {
}
List<String> lines = RuntimeUtil.loadPropertiesLines(settings);
+ // are we using any of the official ASF Kamelets
boolean kamelets = lines.stream().anyMatch(l -> l.startsWith("kamelet="));
+ // are we using custom kamelets
+ boolean customKamelets
+ = lines.stream().anyMatch(l -> (l.startsWith("camel.main.routesIncludePattern=") && l.contains(".kamelet.yaml"))
+ || l.startsWith("camel.component.kamelet.location=") && l.contains(".kamelet.yaml"));
for (String line : lines) {
if (line.startsWith("dependency=")) {
String v = StringHelper.after(line, "dependency=");
@@ -377,25 +382,32 @@ public abstract class ExportBaseCommand extends CamelCommand {
boolean skip = v == null || v.contains("org.apache.camel:camel-core-languages")
|| v.contains("org.apache.camel:camel-java-joor-dsl")
|| v.contains("camel-endpointdsl")
- || !kamelets && v.contains("org.apache.camel:camel-kamelet");
+ || !(kamelets && !customKamelets) && v.contains("org.apache.camel:camel-kamelet");
if (!skip) {
answer.add(v);
}
- if (kamelets && v != null && v.contains("org.apache.camel:camel-kamelet")) {
- // include yaml-dsl and kamelet catalog if we use kamelets
+ if ((kamelets || customKamelets) && v != null && v.contains("org.apache.camel:camel-kamelet")) {
+ // kamelets need yaml-dsl
answer.add("camel:yaml-dsl");
- answer.add("org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
- answer.add("org.apache.camel.kamelets:camel-kamelets-utils:" + kameletsVersion);
+ if (kamelets) {
+ // include JARs for official ASF kamelets
+ answer.add("org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
+ answer.add("org.apache.camel.kamelets:camel-kamelets-utils:" + kameletsVersion);
+ }
}
} else if (line.startsWith("camel.jbang.dependencies=")) {
String deps = StringHelper.after(line, "camel.jbang.dependencies=");
if (!deps.isEmpty()) {
for (String d : deps.split(",")) {
answer.add(d.trim());
- if (kamelets && d.contains("org.apache.camel:camel-kamelet")) {
- // include yaml-dsl and kamelet catalog if we use kamelets
+ if ((kamelets || customKamelets) && d.contains("org.apache.camel:camel-kamelet")) {
+ // kamelets need yaml-dsl
answer.add("camel:yaml-dsl");
- answer.add("org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
+ if (kamelets) {
+ // include JARs for official ASF kamelets
+ answer.add("org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
+ answer.add("org.apache.camel.kamelets:camel-kamelets-utils:" + kameletsVersion);
+ }
}
}
}
@@ -430,16 +442,24 @@ public abstract class ExportBaseCommand extends CamelCommand {
// is it a kamelet?
ext = FileUtil.onlyExt(r, false);
if ("kamelet.yaml".equals(ext)) {
- answer.add("mvn:org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
+ answer.add("camel:kamelet");
+ if (kamelets) {
+ answer.add("mvn:org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
+ }
}
}
}
}
}
- } else if (kamelets && line.startsWith("camel.component.kamelet.location=")) {
- // include kamelet catalog if we use kamelets
- answer.add("mvn:org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
- answer.add("mvn:org.apache.camel.kamelets:camel-kamelets-utils:" + kameletsVersion);
+ } else if ((kamelets || customKamelets) && line.startsWith("camel.component.kamelet.location=")) {
+ // kamelets need yaml-dsl
+ answer.add("camel:kamelet");
+ answer.add("camel:yaml-dsl");
+ if (kamelets) {
+ // include JARs for official ASF kamelets
+ answer.add("mvn:org.apache.camel.kamelets:camel-kamelets:" + kameletsVersion);
+ answer.add("mvn:org.apache.camel.kamelets:camel-kamelets-utils:" + kameletsVersion);
+ }
} else if (line.startsWith("modeline=")) {
answer.add("camel:dsl-modeline");
}
@@ -504,16 +524,24 @@ public abstract class ExportBaseCommand extends CamelCommand {
if (skip) {
continue;
}
+ if ("github".equals(scheme)) {
+ continue;
+ }
String ext = FileUtil.onlyExt(f, true);
+ String ext2 = FileUtil.onlyExt(f, false);
+ if (ext == null) {
+ continue;
+ }
boolean java = "java".equals(ext);
- boolean camel = "camel.main.routesIncludePattern".equals(k);
boolean kamelet = "camel.component.kamelet.location".equals(k)
- || "camel.jbang.localKameletDir".equals(k);
+ || "camel.jbang.localKameletDir".equals(k) || "kamelet.yaml".equalsIgnoreCase(ext2);
+ boolean camel = !kamelet && "camel.main.routesIncludePattern".equals(k);
boolean jkube = "camel.jbang.jkubeFiles".equals(k);
boolean web = "html".equals(ext) || "js".equals(ext) || "css".equals(ext) || "jpeg".equals(ext)
|| "jpg".equals(ext) || "png".equals(ext) || "ico".equals(ext);
File srcWeb = new File(srcResourcesDir, "META-INF/resources");
- File target = java ? srcJavaDir : camel ? srcCamelResourcesDir : web ? srcWeb : srcResourcesDir;
+ File target = java ? srcJavaDir : camel ? srcCamelResourcesDir : kamelet ? srcKameletsResourcesDir
+ : web ? srcWeb : srcResourcesDir;
File source = new File(f);
File out;
if (source.isDirectory()) {
@@ -523,17 +551,17 @@ public abstract class ExportBaseCommand extends CamelCommand {
}
if (!java) {
if (kamelet) {
- out = srcKameletsResourcesDir;
+ out.getParentFile().mkdirs();
safeCopy(source, out, true);
} else if (jkube) {
// file should be renamed and moved into src/main/jkube
f = f.replace(".jkube.yaml", ".yaml");
f = f.replace(".jkube.yml", ".yml");
out = new File(srcCamelResourcesDir.getParentFile().getParentFile(), "jkube/" + f);
- out.mkdirs();
+ out.getParentFile().mkdirs();
safeCopy(source, out, true);
} else {
- out.mkdirs();
+ out.getParentFile().mkdirs();
safeCopy(source, out, true);
}
} else {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index 542b60c6875..829f7e9e032 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -102,9 +102,7 @@ class ExportCamelMain extends Export {
File srcResourcesDir = new File(BUILD_DIR, "src/main/resources");
srcResourcesDir.mkdirs();
File srcCamelResourcesDir = new File(BUILD_DIR, "src/main/resources/camel");
- srcCamelResourcesDir.mkdirs();
File srcKameletsResourcesDir = new File(BUILD_DIR, "src/main/resources/kamelets");
- srcKameletsResourcesDir.mkdirs();
// copy application properties files
copyApplicationPropertiesFiles(srcResourcesDir);
// copy source files
@@ -350,17 +348,19 @@ class ExportCamelMain extends Export {
answer.removeIf(s -> s.contains("camel-main"));
answer.removeIf(s -> s.contains("camel-health"));
- if (openapi != null) {
+ boolean main = answer.stream().anyMatch(s -> s.contains("mvn:org.apache.camel:camel-platform-http-main"));
+ if (openapi != null && !main) {
// include http server if using openapi
answer.add("mvn:org.apache.camel:camel-platform-http-main");
}
-
// if platform-http is included then we need to switch to use camel-platform-http-main as implementation
- if (answer.stream().anyMatch(s -> s.contains("camel-platform-http") && !s.contains("camel-platform-http-main"))) {
+ if (!main && answer.stream().anyMatch(s -> s.contains("camel-platform-http"))) {
+ answer.add("mvn:org.apache.camel:camel-platform-http-main");
+ main = true;
+ }
+ if (main) {
answer.removeIf(s -> s.contains("org.apache.camel:camel-platform-http:"));
answer.removeIf(s -> s.contains("org.apache.camel:camel-platform-http-vertx:"));
- // version does not matter
- answer.add("mvn:org.apache.camel:camel-platform-http-main:1.0-SNAPSHOT");
}
return answer;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 35d1306e516..c989bcf6b2e 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -100,9 +100,7 @@ class ExportQuarkus extends Export {
File srcResourcesDir = new File(BUILD_DIR, "src/main/resources");
srcResourcesDir.mkdirs();
File srcCamelResourcesDir = new File(BUILD_DIR, "src/main/resources/camel");
- srcCamelResourcesDir.mkdirs();
File srcKameletsResourcesDir = new File(BUILD_DIR, "src/main/resources/kamelets");
- srcKameletsResourcesDir.mkdirs();
// copy source files
copySourceFiles(settings, profile, srcJavaDirRoot, srcJavaDir, srcResourcesDir, srcCamelResourcesDir,
srcKameletsResourcesDir, srcPackageName);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index dee37169acb..99111864371 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -98,9 +98,7 @@ class ExportSpringBoot extends Export {
File srcResourcesDir = new File(BUILD_DIR, "src/main/resources");
srcResourcesDir.mkdirs();
File srcCamelResourcesDir = new File(BUILD_DIR, "src/main/resources/camel");
- srcCamelResourcesDir.mkdirs();
File srcKameletsResourcesDir = new File(BUILD_DIR, "src/main/resources/kamelets");
- srcKameletsResourcesDir.mkdirs();
// copy application properties files
copyApplicationPropertiesFiles(srcResourcesDir);
@@ -353,7 +351,8 @@ class ExportSpringBoot extends Export {
// remove out of the box dependencies
answer.removeIf(s -> s.contains("camel-core"));
- if (openapi != null) {
+ boolean http = answer.stream().anyMatch(s -> s.contains("mvn:org.apache.camel:camel-platform-http"));
+ if (openapi != null && !http) {
// include http server if using openapi
answer.add("mvn:org.apache.camel:camel-platform-http");
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
index e3ce99d3681..68d97eb651b 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.stream.Stream;
import org.apache.camel.dsl.jbang.core.common.RuntimeType;
-import org.apache.camel.util.FileUtil;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -53,7 +52,7 @@ class ExportTest {
@AfterEach
public void end() throws IOException {
// force removing, since deleteOnExit is not removing.
- FileUtil.removeDir(workingDir);
+ // FileUtil.removeDir(workingDir);
}
private static Stream<Arguments> runtimeProvider() {
@@ -144,6 +143,84 @@ class ExportTest {
Assertions.assertEquals("1.0.0", model.getVersion());
}
+ @ParameterizedTest
+ @MethodSource("runtimeProvider")
+ public void shouldExportCustomKamelet(RuntimeType rt) throws Exception {
+ Export command = createCommand(rt,
+ new String[] { "src/test/resources/route.yaml", "src/test/resources/user-source.kamelet.yaml" },
+ "--gav=examples:route:1.0.0", "--dir=" + workingDir, "--quiet");
+ int exit = command.doCall();
+
+ Assertions.assertEquals(0, exit);
+ Model model = readMavenModel();
+ Assertions.assertEquals("examples", model.getGroupId());
+ Assertions.assertEquals("route", model.getArtifactId());
+ Assertions.assertEquals("1.0.0", model.getVersion());
+
+ if (rt == RuntimeType.main) {
+ Assertions.assertTrue(containsDependency(model.getDependencies(), "org.apache.camel", "camel-kamelet", null));
+ Assertions
+ .assertFalse(
+ containsDependency(model.getDependencies(), "org.apache.camel.kamelets", "camel-kamelets", null));
+ } else if (rt == RuntimeType.springBoot) {
+ Assertions.assertTrue(
+ containsDependency(model.getDependencies(), "org.apache.camel.springboot", "camel-kamelet-starter", null));
+ Assertions
+ .assertFalse(
+ containsDependency(model.getDependencies(), "org.apache.camel.kamelets", "camel-kamelets", null));
+ } else if (rt == RuntimeType.quarkus) {
+ Assertions.assertTrue(
+ containsDependency(model.getDependencies(), "org.apache.camel.quarkus", "camel-quarkus-kamelet", null));
+ Assertions
+ .assertFalse(
+ containsDependency(model.getDependencies(), "org.apache.camel.kamelets", "camel-kamelets", null));
+ }
+
+ File f = workingDir.toPath().resolve("src/main/resources/kamelets/user-source.kamelet.yaml").toFile();
+ Assertions.assertTrue(f.isFile());
+ Assertions.assertTrue(f.exists());
+ f = workingDir.toPath().resolve("src/main/resources/camel/route.yaml").toFile();
+ Assertions.assertTrue(f.isFile());
+ Assertions.assertTrue(f.exists());
+ }
+
+ @ParameterizedTest
+ @MethodSource("runtimeProvider")
+ public void shouldExportOfficialKamelet(RuntimeType rt) throws Exception {
+ Export command = createCommand(rt, new String[] { "src/test/resources/counter.yaml" },
+ "--gav=examples:route:1.0.0", "--dir=" + workingDir, "--quiet");
+ int exit = command.doCall();
+
+ Assertions.assertEquals(0, exit);
+ Model model = readMavenModel();
+ Assertions.assertEquals("examples", model.getGroupId());
+ Assertions.assertEquals("route", model.getArtifactId());
+ Assertions.assertEquals("1.0.0", model.getVersion());
+
+ if (rt == RuntimeType.main) {
+ Assertions.assertTrue(containsDependency(model.getDependencies(), "org.apache.camel", "camel-kamelet", null));
+ Assertions
+ .assertTrue(
+ containsDependency(model.getDependencies(), "org.apache.camel.kamelets", "camel-kamelets", null));
+ } else if (rt == RuntimeType.springBoot) {
+ Assertions.assertTrue(
+ containsDependency(model.getDependencies(), "org.apache.camel.springboot", "camel-kamelet-starter", null));
+ Assertions
+ .assertTrue(
+ containsDependency(model.getDependencies(), "org.apache.camel.kamelets", "camel-kamelets", null));
+ } else if (rt == RuntimeType.quarkus) {
+ Assertions.assertTrue(
+ containsDependency(model.getDependencies(), "org.apache.camel.quarkus", "camel-quarkus-kamelet", null));
+ Assertions
+ .assertTrue(
+ containsDependency(model.getDependencies(), "org.apache.camel.kamelets", "camel-kamelets", null));
+ }
+
+ File f = workingDir.toPath().resolve("src/main/resources/camel/counter.yaml").toFile();
+ Assertions.assertTrue(f.isFile());
+ Assertions.assertTrue(f.exists());
+ }
+
private Model readMavenModel() throws Exception {
File f = workingDir.toPath().resolve("pom.xml").toFile();
Assertions.assertTrue(f.isFile(), "Not a pom.xml file: " + f);
@@ -161,6 +238,9 @@ class ExportTest {
boolean found = false;
for (int i = 0; i < deps.size() && !found; i++) {
Dependency d = deps.get(i);
+ if (version == null) {
+ d.setVersion(null);
+ }
found = toGAV(d).equals(toGAV(dep));
}
return found;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/resources/route.yaml b/dsl/camel-jbang/camel-jbang-core/src/test/resources/counter.yaml
similarity index 81%
copy from dsl/camel-jbang/camel-jbang-core/src/test/resources/route.yaml
copy to dsl/camel-jbang/camel-jbang-core/src/test/resources/counter.yaml
index 8f13a54fda0..8a07c52a063 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/test/resources/route.yaml
+++ b/dsl/camel-jbang/camel-jbang-core/src/test/resources/counter.yaml
@@ -15,9 +15,12 @@
# limitations under the License.
#
-from:
- uri: timer:tick
- steps:
- - setBody:
- constant: Hello Camel !!!
- - to: log:info
+# camel-k: language=yaml
+
+# Write your routes here, for example:
+- route:
+ from:
+ uri: kamelet:counter-source
+ steps:
+ - log:
+ message: ${body}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/resources/route.yaml b/dsl/camel-jbang/camel-jbang-core/src/test/resources/route.yaml
index 8f13a54fda0..184bd121295 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/test/resources/route.yaml
+++ b/dsl/camel-jbang/camel-jbang-core/src/test/resources/route.yaml
@@ -15,9 +15,9 @@
# limitations under the License.
#
-from:
- uri: timer:tick
- steps:
- - setBody:
- constant: Hello Camel !!!
- - to: log:info
+- from:
+ uri: timer:tick
+ steps:
+ - setBody:
+ constant: Hello Camel !!!
+ - to: log:info
diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/resources/user-source.kamelet.yaml b/dsl/camel-jbang/camel-jbang-core/src/test/resources/user-source.kamelet.yaml
new file mode 100644
index 00000000000..7cbbb6df9bb
--- /dev/null
+++ b/dsl/camel-jbang/camel-jbang-core/src/test/resources/user-source.kamelet.yaml
@@ -0,0 +1,55 @@
+#
+# 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.
+#
+
+apiVersion: camel.apache.org/v1
+kind: Kamelet
+metadata:
+ name: user-source
+ annotations:
+ camel.apache.org/kamelet.support.level: "Stable"
+ camel.apache.org/catalog.version: "main-SNAPSHOT"
+ camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTkuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIKCSB2aWV3Qm94PSIwIDAgNjAgNjAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDYwID [...]
+ camel.apache.org/provider: "Apache Software Foundation"
+ camel.apache.org/kamelet.group: "Users"
+ labels:
+ camel.apache.org/kamelet.type: "source"
+spec:
+ definition:
+ title: "User Source"
+ description: "Produces periodic events about random users!"
+ type: object
+ properties:
+ period:
+ title: Period
+ description: The time interval between two events
+ type: integer
+ default: 5000
+ types:
+ out:
+ mediaType: application/json
+ dependencies:
+ - "camel:timer"
+ - "camel:http"
+ - "camel:kamelet"
+ template:
+ from:
+ uri: "timer:user"
+ parameters:
+ period: "{{period}}"
+ steps:
+ - to: https://random-data-api.com/api/v2/users
+ - to: "kamelet:sink"
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
index 7bb493dbbe5..f6745bc9d0c 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
@@ -81,10 +81,6 @@ public class DependencyDownloaderRoutesLoader extends DefaultRoutesLoader {
// special for kamelet as we want to track loading kamelets
RoutesBuilderLoader loader;
if (KameletRoutesBuilderLoader.EXTENSION.equals(extension)) {
- if (!downloader.alreadyOnClasspath("org.apache.camel.kamelets", "camel-kamelets-catalog", kameletsVersion)) {
- downloader.downloadDependency("org.apache.camel.kamelets", "camel-kamelets-catalog", kameletsVersion);
- }
-
loader = new KnownKameletRoutesBuilderLoader(kameletsVersion);
CamelContextAware.trySetCamelContext(loader, getCamelContext());
// allows for custom initialization